Commit Graph

40393 Commits

Author SHA1 Message Date
Jeff Brown
2ab79e755b Slight change to the unwinder API.
Change-Id: I5424de76a21b74842e004e0281936b3f492d3c7a
2011-11-03 17:30:54 -07:00
Adam Powell
7bb78b725b am b41d9f8a: Merge "Fix bug 5557267 - [ViewPager] non-primary fragments unnecessary stopped if "defer start" is enabled" into ics-mr1
* commit 'b41d9f8a84a325241440b6e950dea6d240134823':
  Fix bug 5557267 - [ViewPager] non-primary fragments unnecessary stopped if "defer start" is enabled
2011-11-02 22:47:42 +00: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
Irfan Sheriff
6023c677db am b419abca: am 7f00c22b: Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0
* commit 'b419abcadad79cd908acfe51dc6e8902c16ff728':
  Avoid duplicate dialogs leading to NPE
2011-11-02 21:42:49 +00: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
40e3faee15 am 4a113251: am 451fa13e: Merge "Ignore errors when untethering" into ics-mr0
* commit '4a113251078ad028d1a071ebf5562185275c7039':
  Ignore errors when untethering
2011-11-02 21:32:26 +00: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
Eric Fischer
1d242eff29 Merge "Import revised translations." 2011-11-02 14:16:29 -07:00
Tor Norbye
596e302aa3 Merge "Set theme-tag in render log when failing to find style" 2011-11-02 12:48:25 -07:00
Scott Main
488f823359 am 42774dec: am aea8d850: docs: a couple typos bugs 5552478 5553096
* commit '42774decd903d0bbd1c57c9aa829719f2a683231':
  docs: a couple typos bugs 5552478 5553096
2011-11-02 19:14:48 +00: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
c3a04726b2 am 1997fe14: Merge "Update KeyBoardView to reflect the interaction model in Latin IME" into ics-mr1
* commit '1997fe1482ecf1ca920c7729a1ad9df5340565f3':
  Update KeyBoardView to reflect the interaction model in Latin IME
2011-11-02 18:55:44 +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
8dbda74732 am 779c1b85: Merge "Make the notification panel header opaque." into ics-mr1
* commit '779c1b8507d939bd3bd6d3e758ded095d91bcd6f':
  Make the notification panel header opaque.
2011-11-02 18:50:06 +00:00
Peter Ng
8a08bd2b14 am c7dbfc64: Merge "making slide unlock on tablet have a larger radius" into ics-mr1
* commit 'c7dbfc640bcbc6a238068742aeaa76473e56037e':
  making slide unlock on tablet have a larger radius
2011-11-02 18:50:03 +00:00
Amith Yamasani
c5ceeb75f2 am dab15d14: Merge "Don\'t expand the SearchView if already expanded." into ics-mr1
* commit 'dab15d14ca2ce9c3a614e97869824c6337e76d51':
  Don't expand the SearchView if already expanded.
2011-11-02 18:47:51 +00: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
ae5b983849 am 11b49ba9: Reconcile with ics-mr0-release ics-factoryrom-2-release
* commit '11b49ba933bab7ff8262139141eef0e5f3c45a18':
  Revert "Merge "BatteryService(jni): properly handle read's return value" into ics-mr0"
  Revert "Merge "Update camera continuous autofocus javadoc." into ics-mr0"
  Revert "Merge "Fix potential segfault in RS watchdog." into ics-mr0"
  Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
  Revert "Merge "BatteryService(jni): properly handle read's return value" into ics-mr0"
2011-11-02 17:59:05 +00:00
Adam Powell
4cb6ff8dd8 am 7a5a50c1: Merge "Bug 5513073 - IllegalArgumentException: View not attached to window manager" into ics-mr1
* commit '7a5a50c12f6a6e094d1e8aa7514df37f1176354a':
  Bug 5513073 - IllegalArgumentException: View not attached to window manager
2011-11-02 17:54:36 +00: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
Svetoslav Ganov
1d150df970 am e5d0f199: Merge "CalendarView title incorrectly updated for different languages." into ics-mr1
* commit 'e5d0f19953189fdd0e2661ebb7f0ea925f14ea13':
  CalendarView title incorrectly updated for different languages.
2011-11-02 17:50:50 +00:00
Svetoslav Ganov
d7f06aa9dd am 6e42470f: Merge "Accessibility window query APIs should respect root name space." into ics-mr1
* commit '6e42470f928bbf60c9fd3d17a2a69a4b96cec170':
  Accessibility window query APIs should respect root name space.
2011-11-02 17:50:48 +00:00
Svetoslav Ganov
c1cb215ed6 am 7f0c850b: Merge "Updating NumberPicker, TimePicker, DatePicker to fit different screen and font sizes." into ics-mr1
* commit '7f0c850b7a4a2b8a135a110a33d053f4d6689559':
  Updating NumberPicker, TimePicker, DatePicker to fit different screen and font sizes.
2011-11-02 17:50:46 +00:00
Irfan Sheriff
e918189827 am f9d8faf7: am 953005e8: Merge "Specify component name for provisioning" into ics-mr0
* commit 'f9d8faf7fe9d23bddf4d8d039805bce806e9b9c6':
  Specify component name for provisioning
2011-11-02 17:50:27 +00:00
Jeff Sharkey
b1a6d8568b am 9427d688: am db0ab2e7: Merge "Process AMS events in NetworkPolicy handler." into ics-mr0
* commit '9427d688bda2d5b177112a58dcfdbcdfdfe98559':
  Process AMS events in NetworkPolicy handler.
2011-11-02 17:50:25 +00:00
Dianne Hackborn
4be28392c9 am 39cec406: Merge "Add new OOM adjustment for the "previous" process." into ics-mr1
* commit '39cec40697ab3d1d106e0c0c21458b2085c96f00':
  Add new OOM adjustment for the "previous" process.
2011-11-02 17:50:23 +00:00
Fabrice Di Meglio
366464d48d am 07b4b314: am bcf05a69: Fix bug #5553401 TextLayoutCache is too verbose: "computeValuesWithHarfbuzz -- need to force to single run"
* commit '07b4b3145333bc8ece9fdbb68ade726b3d6485cd':
  Fix bug #5553401 TextLayoutCache is too verbose: "computeValuesWithHarfbuzz -- need to force to single run"
2011-11-02 17:50:18 +00:00
Dianne Hackborn
8315445a44 am ad41a94b: Merge "Some optimizations." into ics-mr1
* commit 'ad41a94b298f834e13632ee29b27cefd75f10012':
  Some optimizations.
2011-11-02 17:50:14 +00:00
Adam Powell
f0dab34963 am 2eca6133: Merge "Fix bug 5528574 - "View not attached to window manager" upon orientation change when there is a dialog with ActionMode on" into ics-mr1
* commit '2eca6133b69db0a649b8429dcef4ed46b209bf41':
  Fix bug 5528574 - "View not attached to window manager" upon orientation change when there is a dialog with ActionMode on
2011-11-02 17:50:12 +00:00
Katie McCormick
b8e040bafc am 46a10ee0: am d5b25ecc: Merge "Doc Update: Update list of widget classes" into ics-mr0
* commit '46a10ee08d0e51c97923c8e3c54513d228b42467':
  Doc Update: Update list of widget classes
2011-11-02 17:42:41 +00: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
Dima Zavin
98b5619d17 am a9656df5: am f0ad147f: Merge "BatteryService(jni): properly handle read\'s return value" into ics-mr0
* commit 'a9656df58f75946f3eab4dd660df56c9d878a04e':
  BatteryService(jni): properly handle read's return value
2011-11-02 17:31:47 +00:00
The Android Open Source Project
a37fb0506d am a0d5bece: Reconcile with ics-mr0-release
* commit 'a0d5bece38f3b8fb430f3fb996e7baefb78d8602':
2011-11-02 17:31:43 +00:00
Mangesh Ghiware
ee3b6d2090 am 274133df: Merge "Fix setInitialScale() to take display density into account." into ics-mr1
* commit '274133dfef84f93de349fcd34919f4df32279e8a':
  Fix setInitialScale() to take display density into account.
2011-11-02 17:31:38 +00:00
Eric Fischer
7f19c817e1 am abf75396: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit 'abf7539642a7c3d8d31c1d12d705b54cf155db1a':
  Import revised translations.  DO NOT MERGE
2011-11-02 17:31:35 +00:00
Michael Jurka
676cfd1fc6 am 93430b3c: Merge "Fix: never show recents over lock screen" into ics-mr1
* commit '93430b3c6d170bf1db538c21666e0b508e8e48ec':
  Fix: never show recents over lock screen
2011-11-02 17:31:33 +00:00
Peter Ng
cab846e90b am 80c3c87f: Merge "Asset updates for tablet notifications and layout fixes to quicksettings" into ics-mr1
* commit '80c3c87ff08e77c3bcbd14f003e296bed9adba55':
  Asset updates for tablet notifications and layout fixes to quicksettings
2011-11-02 17:31:15 +00:00
Fabrice Di Meglio
236b8cc407 am 3b8d33b1: (-s ours) Merge "Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr1
* commit '3b8d33b131956f3a1b41c15dbe07b1b2d7f44086':
  Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE
2011-11-02 17:31:07 +00:00
Robert Greenwalt
edec2d2087 am 852d72b2: am bd9b1528: Merge "Add cdma_rmnet4 to list of monitored interfaces" into ics-mr0
* commit '852d72b28e6d7d0e6372a9b544641817338002e6':
  Add cdma_rmnet4 to list of monitored interfaces
2011-11-02 17:31:06 +00:00
Daniel Sandler
2173a076cb am 7775f52e: Merge "Bring timestamps back to notifications." into ics-mr1
* commit '7775f52e4aa7703a5721378f5a1103d9486af895':
  Bring timestamps back to notifications.
2011-11-02 17:30:42 +00:00
Jim Miller
dae4c33e42 am a67217c3: Merge "Fix 5404916: Make layout fit on 480x800 hdpi device" into ics-mr1
* commit 'a67217c35ec43e06598b71feae63ce675fa9cac7':
  Fix 5404916: Make layout fit on 480x800 hdpi device
2011-11-02 17:30:40 +00:00
Fabrice Di Meglio
b3d3918b28 am deb15704: (-s ours) am 46e327ca: (-s ours) Merge "Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr0
* commit 'deb15704e9abcfc71bb81a358ff3bb239896474d':
  Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE
2011-11-02 17:30:39 +00:00
Mangesh Ghiware
14509a4b01 am 00ef15b9: Merge "Clamp initial scale between minimum and maximum values." into ics-mr1
* commit '00ef15b98ac0579ebd5f81a1753bc18384e88b8b':
  Clamp initial scale between minimum and maximum values.
2011-11-02 17:30:34 +00:00
Adam Powell
bc3de80d35 am ca4100da: Merge "Fix bug 5534667 - Action bar icons need more space on tablet" into ics-mr1
* commit 'ca4100da0a0481b3b9f464bbc8842b571e8c60d5':
  Fix bug 5534667 - Action bar icons need more space on tablet
2011-11-02 17:30:29 +00:00
Dianne Hackborn
937017fbea am f136aa34: Merge "Various performance and other work." into ics-mr1
* commit 'f136aa341abaaf7fd6f7632d41a30b2989d93985':
  Various performance and other work.
2011-11-02 17:30:26 +00:00
Peter Ng
b57b20912a am 374e23bd: Merge "spinner focused states pumped up" into ics-mr1
* commit '374e23bd11c42e7e472d2490a3dfddb7df198a66':
  spinner focused states pumped up
2011-11-02 17:30:25 +00:00