drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
61,021 Commits 1 Branch 0 Tags
Commit Graph

61021 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Peter Ng
9f360fde26 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
dc36d92964 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
c76e566988 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
779c1b8507 Merge "Make the notification panel header opaque." into ics-mr1 2011-11-02 11:47:04 -07:00
Peter Ng
c7dbfc640b Merge "making slide unlock on tablet have a larger radius" into ics-mr1 2011-11-02 11:46:32 -07:00
Amith Yamasani
dab15d14ca 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
c89d527996 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
8d317b5be8 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
11b49ba933 Reconcile with ics-mr0-release ics-factoryrom-2-release 
Change-Id: I493695d0ea182f32bbfe0e148e192ad1f60ff001
 2011-11-02 10:52:49 -07:00
Svetoslav Ganov
d10b004116 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
4b6de4f5a9 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
9c25727306 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
339590d97e 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
1a9fedf497 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
8f3818c71c 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
4f4b83c50c 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
cf3b31704a am ad41a94b: Merge "Some optimizations." into ics-mr1 
* commit 'ad41a94b298f834e13632ee29b27cefd75f10012':
  Some optimizations.
 2011-11-02 17:50:14 +00:00
Adam Powell
5572015109 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
725e37af10 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
7a5a50c12f Merge "Bug 5513073 - IllegalArgumentException: View not attached to window manager" into ics-mr1 2011-11-02 10:33:52 -07:00
Dima Zavin
17e25155c0 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
86f4e38a08 am a0d5bece: Reconcile with ics-mr0-release 
* commit 'a0d5bece38f3b8fb430f3fb996e7baefb78d8602':
 2011-11-02 17:31:43 +00:00
Mangesh Ghiware
634fe98985 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
2d55e683d5 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
0a698228e6 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
27e7f797c0 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
8fa25162a5 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
380f763e53 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
f7250d75ce 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
3b1ead9b7a 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
31cbaca5f6 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
d99e7accde 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
e5b7967989 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
9e9a64e875 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
2e59fe7eec 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
The Android Open Source Project
cdefffc480 am a0824452: am 9eb4c891: Reconcile with ics-factoryrom-2-release 
* commit 'a0824452d5c511acc7d11396ff2e6423f7b03948':
  Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
 2011-11-02 17:30:20 +00:00
Philip Milne
737f0118ea am 3617933b: Merge " Update to fix for bug 5393156" into ics-mr1 
* commit '3617933bee5a977a7e6c8f8f4b75e580f8bf2ebf':
  Update to fix for bug 5393156
 2011-11-02 17:30:11 +00:00
Jim Miller
02829c30ae am 22726020: am 1dce37bd: Merge "Fix 5497305: Make sure we show SIM unlock when "None" is selected" into ics-mr0 
* commit '2272602032e5051d5067a7a95c741304468a81af':
  Fix 5497305: Make sure we show SIM unlock when "None" is selected
 2011-11-02 17:29:49 +00:00
Chih-Chung Chang
25ba325ad3 am 11ba6da4: am 4b6353ea: Merge "Update camera continuous autofocus javadoc." into ics-mr0 
* commit '11ba6da460572b9ce9cb9dc0d5a76b710e7efdb3':
  Update camera continuous autofocus javadoc.
 2011-11-02 17:29:46 +00:00
satok
219e2c7821 am ff93e417: Merge "Resolve memory leak in TextServicesManagerService" into ics-mr1 
* commit 'ff93e417a217703a635d8601b835853e07233afd':
  Resolve memory leak in TextServicesManagerService
 2011-11-02 17:29:35 +00:00
Adam Powell
a0684aafc8 am b1db20bd: Merge "Fix bug 5514022 - ListView should not auto-scroll selected item to top when gaining focus" into ics-mr1 
* commit 'b1db20bde5e00c8cdd1a97b07ddcc41f321d3db8':
  Fix bug 5514022 - ListView should not auto-scroll selected item to top when gaining focus
 2011-11-02 17:29:33 +00:00
Stephen Hines
293b27e458 am af3a854b: am af675222: Merge "Fix potential segfault in RS watchdog." into ics-mr0 
* commit 'af3a854b549409c4ad77c686e860f97ea86706a0':
  Fix potential segfault in RS watchdog.
 2011-11-02 17:29:30 +00:00
The Android Automerger
beb470af43 Revert "Merge "BatteryService(jni): properly handle read's return value" into ics-mr0" 
This reverts commit f0ad147fc33cf55cd9427010b2cdb3eb89b9eec3, reversing
changes made to bd9b1528051a1b257768fdbc5077a2d4473b02dd.
 2011-11-02 10:18:09 -07:00
Svetoslav Ganov
e5d0f19953 Merge "CalendarView title incorrectly updated for different languages." into ics-mr1 2011-11-02 10:14:46 -07:00
The Android Automerger
8e31988d26 Revert "Merge "Update camera continuous autofocus javadoc." into ics-mr0" 
This reverts commit 4b6353ea0265bfed52d0637abd1b17596ce25ff0, reversing
changes made to af675222f6340a8a9edbe9e8635014a18521e5e0.
 2011-11-02 10:14:18 -07:00
Svetoslav Ganov
6e42470f92 Merge "Accessibility window query APIs should respect root name space." into ics-mr1 2011-11-02 10:13:55 -07:00
Svetoslav Ganov
7f0c850b7a 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
5070dd097c Revert "Merge "Fix potential segfault in RS watchdog." into ics-mr0" 
This reverts commit af675222f6340a8a9edbe9e8635014a18521e5e0, reversing
changes made to 6e91e5b689a3eb8e6a6f3c038322b8044a9d6670.
 2011-11-02 10:07:57 -07:00
The Android Automerger
5db81e1f1c 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
8063b843e4 merge in ics-factoryrom-2-release history after reset to ics-mr0 2011-11-02 09:48:55 -07:00