Commit Graph

40208 Commits

Author SHA1 Message Date
Eric Fischer
13544d0668 am 8c49b81b: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '8c49b81b5971c3fd254c4ecd862d1a32b1917edb':
  Import revised translations.  DO NOT MERGE
2011-11-03 00:04:10 +00:00
Katie McCormick
4dd25d2473 am e08be659: Merge "Doc change: Update instructions to match ICS UI" into ics-mr0
* commit 'e08be659eba742d117d24f642a95ba65e13bd015':
  Doc change: Update instructions to match ICS UI
2011-11-03 00:04:09 +00:00
Eric Fischer
d6474254b8 Merge "Import revised translations. DO NOT MERGE" into ics-mr0 2011-11-02 16:17:03 -07:00
Adam Powell
dbc5f6ce5d Merge "Fix bug 5557267 - [ViewPager] non-primary fragments unnecessary stopped if "defer start" is enabled" into ics-mr1 2011-11-02 15:44:31 -07:00
Katie McCormick
3ad9593529 Merge "Doc change: Update instructions to match ICS UI" into ics-mr0 2011-11-02 15:42:18 -07:00
Irfan Sheriff
6c9bd888a7 am 7f00c22b: Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0
* commit '7f00c22b7fa7b38b644585c0a3c6faadc5def94c':
  Avoid duplicate dialogs leading to NPE
2011-11-02 21:38:55 +00:00
Irfan Sheriff
712fd592e0 Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0 2011-11-02 14:37:19 -07:00
Robert Greenwalt
5333e1f764 am 451fa13e: Merge "Ignore errors when untethering" into ics-mr0
* commit '451fa13e82ea1226895b41282fdb33bf9fea5d19':
  Ignore errors when untethering
2011-11-02 21:28:33 +00:00
Robert Greenwalt
a90153f696 Merge "Ignore errors when untethering" into ics-mr0 2011-11-02 14:26:45 -07:00
Scott Main
7b5e2b93be am aea8d850: docs: a couple typos bugs 5552478 5553096
* commit 'aea8d8500395f7e7dce3f670933f7aaf02be7b11':
  docs: a couple typos bugs 5552478 5553096
2011-11-02 19:10:21 +00:00
Svetoslav Ganov
aba3c0c36c Merge "Update KeyBoardView to reflect the interaction model in Latin IME" into ics-mr1 2011-11-02 11:51:58 -07:00
Peter Ng
c001daee5a Merge "Make the notification panel header opaque." into ics-mr1 2011-11-02 11:47:04 -07:00
Peter Ng
a7c9bbfc08 Merge "making slide unlock on tablet have a larger radius" into ics-mr1 2011-11-02 11:46:32 -07:00
Amith Yamasani
b9afb7b598 Merge "Don't expand the SearchView if already expanded." into ics-mr1 2011-11-02 11:43:53 -07:00
The Android Open Source Project
d4460f9733 Reconcile with ics-mr0-release ics-factoryrom-2-release
Change-Id: I493695d0ea182f32bbfe0e148e192ad1f60ff001
2011-11-02 10:52:49 -07:00
Adam Powell
a26f7fab72 Merge "Bug 5513073 - IllegalArgumentException: View not attached to window manager" into ics-mr1 2011-11-02 10:33:52 -07:00
Svetoslav Ganov
c7172bb91c Merge "CalendarView title incorrectly updated for different languages." into ics-mr1 2011-11-02 10:14:46 -07:00
Svetoslav Ganov
92d37ea669 Merge "Accessibility window query APIs should respect root name space." into ics-mr1 2011-11-02 10:13:55 -07:00
Svetoslav Ganov
95445649d9 Merge "Updating NumberPicker, TimePicker, DatePicker to fit different screen and font sizes." into ics-mr1 2011-11-02 10:13:17 -07:00
The Android Automerger
7e3626866f Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
This reverts commit 2d280f754e32e556407df05d977cfabdfff1c070, reversing
changes made to 2cc1c5d067736f221554be593c2ba2c96390f847.
2011-11-02 10:05:33 -07:00
The Android Automerger
88cd24607e merge in ics-factoryrom-2-release history after reset to ics-mr0 2011-11-02 09:48:55 -07:00
The Android Automerger
f34412f489 merge in ics-mr0-release history after reset to ics-mr0 2011-11-02 06:28:40 -07:00
Irfan Sheriff
8d85b36c54 am 953005e8: Merge "Specify component name for provisioning" into ics-mr0
* commit '953005e8243e4dc898a00d9a1612ae82772913b9':
  Specify component name for provisioning
2011-11-02 04:18:14 +00:00
Jeff Sharkey
1b0401f996 am db0ab2e7: Merge "Process AMS events in NetworkPolicy handler." into ics-mr0
* commit 'db0ab2e731d755f64583c5704fa406bc0e7a2af4':
  Process AMS events in NetworkPolicy handler.
2011-11-02 04:16:13 +00:00
Irfan Sheriff
cb8740f108 Merge "Specify component name for provisioning" into ics-mr0 2011-11-01 21:15:26 -07:00
Jeff Sharkey
a8f0322f70 Merge "Process AMS events in NetworkPolicy handler." into ics-mr0 2011-11-01 21:14:35 -07:00
Dianne Hackborn
dd196eca67 Merge "Add new OOM adjustment for the "previous" process." into ics-mr1 2011-11-01 21:11:18 -07:00
Fabrice Di Meglio
d7158de84d am bcf05a69: Fix bug #5553401 TextLayoutCache is too verbose: "computeValuesWithHarfbuzz -- need to force to single run"
* commit 'bcf05a69090f342d328f1537d1d83406b883290b':
  Fix bug #5553401 TextLayoutCache is too verbose: "computeValuesWithHarfbuzz -- need to force to single run"
2011-11-02 02:17:48 +00:00
Dianne Hackborn
625b34ebc1 Merge "Some optimizations." into ics-mr1 2011-11-01 18:02:44 -07:00
Adam Powell
ca45414224 Merge "Fix bug 5528574 - "View not attached to window manager" upon orientation change when there is a dialog with ActionMode on" into ics-mr1 2011-11-01 17:27:26 -07:00
Katie McCormick
7400517e63 am d5b25ecc: Merge "Doc Update: Update list of widget classes" into ics-mr0
* commit 'd5b25ecc07efb9d7f725731f29241217266b4c0c':
  Doc Update: Update list of widget classes
2011-11-02 00:11:01 +00:00
Katie McCormick
84b955e66f Merge "Doc Update: Update list of widget classes" into ics-mr0 2011-11-01 17:09:44 -07:00
Dima Zavin
a9c14ee513 am f0ad147f: Merge "BatteryService(jni): properly handle read\'s return value" into ics-mr0
* commit 'f0ad147fc33cf55cd9427010b2cdb3eb89b9eec3':
  BatteryService(jni): properly handle read's return value
2011-11-01 22:32:06 +00:00
Dima Zavin
2ea1501028 Merge "BatteryService(jni): properly handle read's return value" into ics-mr0 2011-11-01 15:29:42 -07:00
The Android Open Source Project
8ee99aad34 Reconcile with ics-mr0-release
Change-Id: I14f9c7648ae8cc7403a6c605d12aba8eec553e80
2011-11-01 14:28:57 -07:00
Mangesh Ghiware
ce3b88b145 Merge "Fix setInitialScale() to take display density into account." into ics-mr1 2011-11-01 14:02:05 -07:00
Eric Fischer
529d127495 Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-11-01 13:53:14 -07:00
Michael Jurka
f641d134a6 Merge "Fix: never show recents over lock screen" into ics-mr1 2011-11-01 13:53:02 -07:00
Peter Ng
a5268c55aa Merge "Asset updates for tablet notifications and layout fixes to quicksettings" into ics-mr1 2011-11-01 13:45:18 -07:00
Fabrice Di Meglio
05c74c26fb Merge "Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr1 2011-11-01 13:30:24 -07:00
Robert Greenwalt
9f0f58fa6b am bd9b1528: Merge "Add cdma_rmnet4 to list of monitored interfaces" into ics-mr0
* commit 'bd9b1528051a1b257768fdbc5077a2d4473b02dd':
  Add cdma_rmnet4 to list of monitored interfaces
2011-11-01 20:29:42 +00:00
Robert Greenwalt
8782f962e6 Merge "Add cdma_rmnet4 to list of monitored interfaces" into ics-mr0 2011-11-01 13:27:56 -07:00
Daniel Sandler
72c3a93927 Merge "Bring timestamps back to notifications." into ics-mr1 2011-11-01 13:05:41 -07:00
Jim Miller
5f81b16731 Merge "Fix 5404916: Make layout fit on 480x800 hdpi device" into ics-mr1 2011-11-01 12:45:11 -07:00
Fabrice Di Meglio
1d55ff9fdc am 46e327ca: (-s ours) Merge "Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr0
* commit '46e327ca32a29432941ba4487077577b10243aed':
  Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE
2011-11-01 19:42:48 +00:00
Fabrice Di Meglio
33ba0be0de Merge "Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr0 2011-11-01 12:41:04 -07:00
Mangesh Ghiware
28e2117ac8 Merge "Clamp initial scale between minimum and maximum values." into ics-mr1 2011-11-01 11:28:01 -07:00
Adam Powell
399a23a3c2 Merge "Fix bug 5534667 - Action bar icons need more space on tablet" into ics-mr1 2011-11-01 10:58:58 -07:00
Dianne Hackborn
770e520a5a Merge "Various performance and other work." into ics-mr1 2011-11-01 10:42:54 -07:00
Peter Ng
3aa6082099 Merge "spinner focused states pumped up" into ics-mr1 2011-11-01 10:29:25 -07:00