OSDN Git Service

android-x86/frameworks-native.git
12 years agoMerge "Update to hidden APIs"
RoboErik [Tue, 18 Oct 2011 17:47:50 +0000 (10:47 -0700)]
Merge "Update to hidden APIs"

12 years agoam 2bd3c2f7: Merge "Fix null ptr exception in getReadingLevelScale()" into ics-mr0
Mangesh Ghiware [Tue, 18 Oct 2011 17:32:36 +0000 (10:32 -0700)]
am 2bd3c2f7: Merge "Fix null ptr exception in getReadingLevelScale()" into ics-mr0

* commit '2bd3c2f7e89eb02f2b240672631c57bc912a9575':
  Fix null ptr exception in getReadingLevelScale()

12 years agoMerge "Fix null ptr exception in getReadingLevelScale()" into ics-mr0
Mangesh Ghiware [Tue, 18 Oct 2011 17:31:15 +0000 (10:31 -0700)]
Merge "Fix null ptr exception in getReadingLevelScale()" into ics-mr0

12 years agoam dba69061: Merge "Send availability info more reliably" into ics-mr0
Robert Greenwalt [Tue, 18 Oct 2011 16:44:22 +0000 (09:44 -0700)]
am dba69061: Merge "Send availability info more reliably" into ics-mr0

* commit 'dba69061a6e9c25d968819cee47ab13e5b554b9a':
  Send availability info more reliably

12 years agoMerge "Send availability info more reliably" into ics-mr0
Robert Greenwalt [Tue, 18 Oct 2011 16:42:33 +0000 (09:42 -0700)]
Merge "Send availability info more reliably" into ics-mr0

12 years agoam a548b5cb: Merge "Removing Testudo and adding Themos ringtone Bug: 5416299" into...
Justin Ho [Tue, 18 Oct 2011 16:33:10 +0000 (09:33 -0700)]
am a548b5cb: Merge "Removing Testudo and adding Themos ringtone Bug: 5416299" into ics-mr0

* commit 'a548b5cb82008d2d6629ab78ba775a24bff55040':
  Removing Testudo and adding Themos ringtone Bug: 5416299

12 years agoMerge "Removing Testudo and adding Themos ringtone Bug: 5416299" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 16:31:01 +0000 (09:31 -0700)]
Merge "Removing Testudo and adding Themos ringtone Bug: 5416299" into ics-mr0

12 years agoam b7ad8253: Merge "Add documents for the spell checker framework and the input metho...
satok [Tue, 18 Oct 2011 16:17:31 +0000 (09:17 -0700)]
am b7ad8253: Merge "Add documents for the spell checker framework and the input method subtype" into ics-mr0

* commit 'b7ad82533596b73ecd40f22bfe48b1b785b05068':
  Add documents for the spell checker framework and the input method subtype

12 years agoMerge "Add documents for the spell checker framework and the input method subtype...
satok [Tue, 18 Oct 2011 16:15:48 +0000 (09:15 -0700)]
Merge "Add documents for the spell checker framework and the input method subtype" into ics-mr0

12 years agoReconcile with ics-mr0-release
The Android Open Source Project [Tue, 18 Oct 2011 14:31:56 +0000 (07:31 -0700)]
Reconcile with ics-mr0-release

Change-Id: Ife215fa3762b795be28dfe472095c5e7e0b7624f

12 years agomerge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Tue, 18 Oct 2011 13:28:19 +0000 (06:28 -0700)]
merge in ics-mr0-release history after reset to ics-mr0

12 years agoam 11116b80: Merge "Disconnect without CTRL-EVENT-DISCONNECTED" into ics-mr0
Irfan Sheriff [Tue, 18 Oct 2011 03:33:07 +0000 (20:33 -0700)]
am 11116b80: Merge "Disconnect without CTRL-EVENT-DISCONNECTED" into ics-mr0

* commit '11116b80d88b72e14e4f6b7ad3ab312096f8eea5':
  Disconnect without CTRL-EVENT-DISCONNECTED

12 years agoMerge "Disconnect without CTRL-EVENT-DISCONNECTED" into ics-mr0
Irfan Sheriff [Tue, 18 Oct 2011 03:31:50 +0000 (20:31 -0700)]
Merge "Disconnect without CTRL-EVENT-DISCONNECTED" into ics-mr0

12 years agomerge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Tue, 18 Oct 2011 03:08:56 +0000 (20:08 -0700)]
merge in ics-mr0-release history after reset to ics-mr0

12 years agoam c0a87dc1: Merge "Fix issue 5462427: Volume should never be 0 ..." into ics-mr0
Eric Laurent [Tue, 18 Oct 2011 02:50:36 +0000 (19:50 -0700)]
am c0a87dc1: Merge "Fix issue 5462427: Volume should never be 0 ..." into ics-mr0

* commit 'c0a87dc10cc74918518457e96b48f16bcc0ea2cd':
  Fix issue 5462427: Volume should never be 0 ...

12 years agoMerge "Fix issue 5462427: Volume should never be 0 ..." into ics-mr0
Eric Laurent [Tue, 18 Oct 2011 02:48:31 +0000 (19:48 -0700)]
Merge "Fix issue 5462427: Volume should never be 0 ..." into ics-mr0

12 years agoam a84e37f3: Merge "Fix 5468644: Use the proper audio stream type to play sound....
Chih-Chung Chang [Tue, 18 Oct 2011 02:42:14 +0000 (19:42 -0700)]
am a84e37f3: Merge "Fix 5468644: Use the proper audio stream type to play sound." into ics-mr0

* commit 'a84e37f37c7cd21fe498a923c181d3896e055d56':
  Fix 5468644: Use the proper audio stream type to play sound.

12 years agoMerge "Fix 5468644: Use the proper audio stream type to play sound." into ics-mr0
Chih-Chung Chang [Tue, 18 Oct 2011 02:40:12 +0000 (19:40 -0700)]
Merge "Fix 5468644: Use the proper audio stream type to play sound." into ics-mr0

12 years agoam 6f13adb2: Merge "Don\'t hold onto the lock while reconnecting to the server" into...
Dave Burke [Tue, 18 Oct 2011 01:36:48 +0000 (18:36 -0700)]
am 6f13adb2: Merge "Don\'t hold onto the lock while reconnecting to the server" into ics-mr0

* commit '6f13adb22afcb47a1cd45a90eaa3c154522089d4':
  Don't hold onto the lock while reconnecting to the server

12 years agoMerge "Don't hold onto the lock while reconnecting to the server" into ics-mr0
Dave Burke [Tue, 18 Oct 2011 01:35:11 +0000 (18:35 -0700)]
Merge "Don't hold onto the lock while reconnecting to the server" into ics-mr0

12 years agoam 9a7e4ce7: Merge "Fix 5466678: use new setSystemUiVisibility() API to enable clock...
Jim Miller [Tue, 18 Oct 2011 01:06:08 +0000 (18:06 -0700)]
am 9a7e4ce7: Merge "Fix 5466678: use new setSystemUiVisibility() API to enable clock in statusbar" into ics-mr0

* commit '9a7e4ce72a1f97832e71386ad023439ed9b179bd':
  Fix 5466678: use new setSystemUiVisibility() API to enable clock in statusbar

12 years agoMerge "Fix 5466678: use new setSystemUiVisibility() API to enable clock in statusbar...
Jim Miller [Tue, 18 Oct 2011 01:03:38 +0000 (18:03 -0700)]
Merge "Fix 5466678: use new setSystemUiVisibility() API to enable clock in statusbar" into ics-mr0

12 years agoam 7788c51d: Merge "Fix onFirstLayout path for saved pages" into ics-mr0
John Reck [Tue, 18 Oct 2011 00:50:39 +0000 (17:50 -0700)]
am 7788c51d: Merge "Fix onFirstLayout path for saved pages" into ics-mr0

* commit '7788c51d82963a8645655675c675424db694ad85':
  Fix onFirstLayout path for saved pages

12 years agoMerge "Fix onFirstLayout path for saved pages" into ics-mr0
John Reck [Tue, 18 Oct 2011 00:48:58 +0000 (17:48 -0700)]
Merge "Fix onFirstLayout path for saved pages" into ics-mr0

12 years agoam f129988a: Merge "Bullet points updated and permission colors are not orange" into...
Peter Ng [Tue, 18 Oct 2011 00:26:10 +0000 (17:26 -0700)]
am f129988a: Merge "Bullet points updated and permission colors are not orange" into ics-mr0

* commit 'f129988a1aa8a210dc125b0f427d848a2aeb8bb2':
  Bullet points updated and permission colors are not orange

12 years agoMerge "Bullet points updated and permission colors are not orange" into ics-mr0
Peter Ng [Tue, 18 Oct 2011 00:24:32 +0000 (17:24 -0700)]
Merge "Bullet points updated and permission colors are not orange" into ics-mr0

12 years agoam e95a1190: Merge "Update unlock halo asset" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:23:15 +0000 (17:23 -0700)]
am e95a1190: Merge "Update unlock halo asset" into ics-mr0

* commit 'e95a1190ff9e15ac0924cd7f294cf6a486e3119f':
  Update unlock halo asset

12 years agoam 0f86772a: Merge "Update text select handles" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:23:14 +0000 (17:23 -0700)]
am 0f86772a: Merge "Update text select handles" into ics-mr0

* commit '0f86772ad7837a1b084bba7f8180f267e958a9b2':
  Update text select handles

12 years agoam c598fcf4: Merge "Update stat_sys icons with different resize method" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:23:12 +0000 (17:23 -0700)]
am c598fcf4: Merge "Update stat_sys icons with different resize method" into ics-mr0

* commit 'c598fcf4d24357628c56888440b39a130a36824a':
  Update stat_sys icons with different resize method

12 years agoam 49317b77: Merge "Update spinner assets" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:23:10 +0000 (17:23 -0700)]
am 49317b77: Merge "Update spinner assets" into ics-mr0

* commit '49317b77fddd03ed8a5bed520aefc248edfb9e14':
  Update spinner assets

12 years agoam 0c7020dd: Merge "Update scrubber assets" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:23:09 +0000 (17:23 -0700)]
am 0c7020dd: Merge "Update scrubber assets" into ics-mr0

* commit '0c7020dd524a8354ea11ffa2228ac6a930e5114b':
  Update scrubber assets

12 years agoam d864a503: Merge "Update rating stars" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:23:06 +0000 (17:23 -0700)]
am d864a503: Merge "Update rating stars" into ics-mr0

* commit 'd864a503c0ea201c12266ca2dc4da1ccc2d66e0b':
  Update rating stars

12 years agoam 488eddca: Merge "Update lockscreen assets" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:23:05 +0000 (17:23 -0700)]
am 488eddca: Merge "Update lockscreen assets" into ics-mr0

* commit '488eddca0f1b2fd824de52e0f38c90b2d129d3b0':
  Update lockscreen assets

12 years agoam e93f09d6: Merge "Update lockscreen assets" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:23:04 +0000 (17:23 -0700)]
am e93f09d6: Merge "Update lockscreen assets" into ics-mr0

* commit 'e93f09d66853f568eb253b458bd2cad2a34cb79a':
  Update lockscreen assets

12 years agoam 2076de1b: Merge "Update fastscroll assets" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:23:02 +0000 (17:23 -0700)]
am 2076de1b: Merge "Update fastscroll assets" into ics-mr0

* commit '2076de1b43bfff65635bd314bbaae0400afd091c':
  Update fastscroll assets

12 years agoam 8ffa1371: Merge "Update checkboxes" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:23:01 +0000 (17:23 -0700)]
am 8ffa1371: Merge "Update checkboxes" into ics-mr0

* commit '8ffa1371616eb8096e8063bdff3fef75f74efbc5':
  Update checkboxes

12 years agoMerge "Update unlock halo asset" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:21:47 +0000 (17:21 -0700)]
Merge "Update unlock halo asset" into ics-mr0

12 years agoMerge "Update text select handles" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:21:30 +0000 (17:21 -0700)]
Merge "Update text select handles" into ics-mr0

12 years agoMerge "Update stat_sys icons with different resize method" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:21:22 +0000 (17:21 -0700)]
Merge "Update stat_sys icons with different resize method" into ics-mr0

12 years agoMerge "Update spinner assets" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:21:15 +0000 (17:21 -0700)]
Merge "Update spinner assets" into ics-mr0

12 years agoMerge "Update scrubber assets" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:21:06 +0000 (17:21 -0700)]
Merge "Update scrubber assets" into ics-mr0

12 years agoMerge "Update rating stars" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:20:57 +0000 (17:20 -0700)]
Merge "Update rating stars" into ics-mr0

12 years agoMerge "Update lockscreen assets" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:20:49 +0000 (17:20 -0700)]
Merge "Update lockscreen assets" into ics-mr0

12 years agoMerge "Update lockscreen assets" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:20:40 +0000 (17:20 -0700)]
Merge "Update lockscreen assets" into ics-mr0

12 years agoMerge "Update fastscroll assets" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:20:32 +0000 (17:20 -0700)]
Merge "Update fastscroll assets" into ics-mr0

12 years agoMerge "Update checkboxes" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:20:22 +0000 (17:20 -0700)]
Merge "Update checkboxes" into ics-mr0

12 years agoam 68bb87b9: Merge "Update stars" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:19:31 +0000 (17:19 -0700)]
am 68bb87b9: Merge "Update stars" into ics-mr0

* commit '68bb87b9f927555add2eb061510e54f477abcb29':
  Update stars

12 years agoMerge "Update stars" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:17:31 +0000 (17:17 -0700)]
Merge "Update stars" into ics-mr0

12 years agoMerge "Return early when we cannot allocate a hardware layer Bug #5462308"
Romain Guy [Tue, 18 Oct 2011 00:11:08 +0000 (17:11 -0700)]
Merge "Return early when we cannot allocate a hardware layer Bug #5462308"

12 years agoam 3877089c: Merge "Update Settings Storage app icon" into ics-mr0
Justin Ho [Mon, 17 Oct 2011 23:00:04 +0000 (16:00 -0700)]
am 3877089c: Merge "Update Settings Storage app icon" into ics-mr0

* commit '3877089c8e40402bf3e0c236e8d7add6ce73fb11':
  Update Settings Storage app icon

12 years agoMerge "Update Settings Storage app icon" into ics-mr0
Justin Ho [Mon, 17 Oct 2011 22:57:39 +0000 (15:57 -0700)]
Merge "Update Settings Storage app icon" into ics-mr0

12 years agoam 5f94580c: Merge "Update default app icon" into ics-mr0
Justin Ho [Mon, 17 Oct 2011 22:54:25 +0000 (15:54 -0700)]
am 5f94580c: Merge "Update default app icon" into ics-mr0

* commit '5f94580c93031c515fffb80a350430cd7bde434d':
  Update default app icon

12 years agoam ffaab837: Merge "docs: adt and tools filesizes and md5sums" into ics-mr0
Robert Ly [Mon, 17 Oct 2011 22:54:24 +0000 (15:54 -0700)]
am ffaab837: Merge "docs: adt and tools filesizes and md5sums" into ics-mr0

* commit 'ffaab837e7686fa81ab20e1fed32d33c684a295e':
  docs: adt and tools filesizes and md5sums

12 years agoMerge "Update default app icon" into ics-mr0
Justin Ho [Mon, 17 Oct 2011 22:53:00 +0000 (15:53 -0700)]
Merge "Update default app icon" into ics-mr0

12 years agoMerge "docs: adt and tools filesizes and md5sums" into ics-mr0
Robert Ly [Mon, 17 Oct 2011 22:52:51 +0000 (15:52 -0700)]
Merge "docs: adt and tools filesizes and md5sums" into ics-mr0

12 years agoam 9a0732af: Merge "SensorManager reconnects to sensor service when the later dies...
Mathias Agopian [Mon, 17 Oct 2011 22:52:31 +0000 (15:52 -0700)]
am 9a0732af: Merge "SensorManager reconnects to sensor service when the later dies" into ics-mr0

* commit '9a0732af1bd96a7d8247dee124a7da389137a52f':
  SensorManager reconnects to sensor service when the later dies

12 years agoMerge "SensorManager reconnects to sensor service when the later dies" into ics-mr0
Mathias Agopian [Mon, 17 Oct 2011 22:50:36 +0000 (15:50 -0700)]
Merge "SensorManager reconnects to sensor service when the later dies" into ics-mr0

12 years agoam 31603aac: Merge "Validate commands and arguments." into ics-mr0
Jeff Sharkey [Mon, 17 Oct 2011 22:31:10 +0000 (15:31 -0700)]
am 31603aac: Merge "Validate commands and arguments." into ics-mr0

* commit '31603aacbb54b98cbee498412f6a5eb9dd4a2788':
  Validate commands and arguments.

12 years agoMerge "Validate commands and arguments." into ics-mr0
Jeff Sharkey [Mon, 17 Oct 2011 22:29:25 +0000 (15:29 -0700)]
Merge "Validate commands and arguments." into ics-mr0

12 years agoam 5d199737: Merge "Fix stupid bug breaking touch on devices without a nav bar."...
Dianne Hackborn [Mon, 17 Oct 2011 22:28:07 +0000 (15:28 -0700)]
am 5d199737: Merge "Fix stupid bug breaking touch on devices without a nav bar." into ics-mr0

* commit '5d199737cb22733b065453ee95dfd9c9e5e87d5b':
  Fix stupid bug breaking touch on devices without a nav bar.

12 years agoMerge "Fix stupid bug breaking touch on devices without a nav bar." into ics-mr0
Dianne Hackborn [Mon, 17 Oct 2011 22:26:18 +0000 (15:26 -0700)]
Merge "Fix stupid bug breaking touch on devices without a nav bar." into ics-mr0

12 years agoMerge "docs: nfc updates"
Robert Ly [Mon, 17 Oct 2011 22:23:18 +0000 (15:23 -0700)]
Merge "docs: nfc updates"

12 years agoMerge "String edits to bring to standards. Bugs: 5165745, 5163232, 5162668, 5162667...
Claudia de Veaux [Mon, 17 Oct 2011 21:05:36 +0000 (14:05 -0700)]
Merge "String edits to bring to standards. Bugs: 51657455163232516266851626675162328"

12 years agoam c4de6f81: Merge "MediaPlayer: properly handle released surfaces" into ics-mr0
Jamie Gennis [Mon, 17 Oct 2011 19:40:49 +0000 (12:40 -0700)]
am c4de6f81: Merge "MediaPlayer: properly handle released surfaces" into ics-mr0

* commit 'c4de6f81d4533acbfc162d051de480d474b72e76':
  MediaPlayer: properly handle released surfaces

12 years agoMerge "MediaPlayer: properly handle released surfaces" into ics-mr0
Jamie Gennis [Mon, 17 Oct 2011 19:38:36 +0000 (12:38 -0700)]
Merge "MediaPlayer: properly handle released surfaces" into ics-mr0

12 years agoReconcile with ics-mr0-release
The Android Open Source Project [Mon, 17 Oct 2011 19:20:06 +0000 (12:20 -0700)]
Reconcile with ics-mr0-release

Change-Id: Id91d1990671b3bb8778b0bac178a36e63f7c7b8a

12 years agoam 63fae9d5: Merge "Layout changes to recents" into ics-mr0
Peter Ng [Mon, 17 Oct 2011 18:58:54 +0000 (11:58 -0700)]
am 63fae9d5: Merge "Layout changes to recents" into ics-mr0

* commit '63fae9d56286e7c51261a5a00755466b350efa33':
  Layout changes to recents

12 years agoMerge "Layout changes to recents" into ics-mr0
Peter Ng [Mon, 17 Oct 2011 18:57:38 +0000 (11:57 -0700)]
Merge "Layout changes to recents" into ics-mr0

12 years agoam ca3c8a97: Merge "docs: revisions to api overview" into ics-mr0
Scott Main [Mon, 17 Oct 2011 18:35:54 +0000 (11:35 -0700)]
am ca3c8a97: Merge "docs: revisions to api overview" into ics-mr0

* commit 'ca3c8a9703ccde66570f0130bb3a8863dd53e4b6':
  docs: revisions to api overview

12 years agoam 3a735078: Merge "SurfaceTexture: report binder transaction failures" into ics-mr0
Jamie Gennis [Mon, 17 Oct 2011 18:35:53 +0000 (11:35 -0700)]
am 3a735078: Merge "SurfaceTexture: report binder transaction failures" into ics-mr0

* commit '3a73507801b56da83140fad14a1a3d4eced213d9':
  SurfaceTexture: report binder transaction failures

12 years agoam c047f60d: Merge "Fix issue #5445666: bunch of com.android.server.TextServicesManag...
Dianne Hackborn [Mon, 17 Oct 2011 18:32:51 +0000 (11:32 -0700)]
am c047f60d: Merge "Fix issue #5445666: bunch of com.android.server.TextServicesManagerService crashes" into ics-mr0

* commit 'c047f60db277252f8921b88c82df1a8812afb169':
  Fix issue #5445666: bunch of com.android.server.TextServicesManagerService crashes

12 years agoam 61e980d6: Merge "Turn off chatty logging." into ics-mr0
Daniel Sandler [Mon, 17 Oct 2011 18:32:47 +0000 (11:32 -0700)]
am 61e980d6: Merge "Turn off chatty logging." into ics-mr0

* commit '61e980d6187aa052e92387d7b12b3179a9427db4':
  Turn off chatty logging.

12 years agoam 1aad3b5e: Merge "Issue 5432115: Speed up notification scrolling" into ics-mr0
Chet Haase [Mon, 17 Oct 2011 18:32:45 +0000 (11:32 -0700)]
am 1aad3b5e: Merge "Issue 5432115: Speed up notification scrolling" into ics-mr0

* commit '1aad3b5e336a04ed612c091d8002569f959e1722':
  Issue 5432115: Speed up notification scrolling

12 years agoam 49a98c8f: Merge "Showing notifications after taking a screenshot (Bug: 5333706...
Winson Chung [Mon, 17 Oct 2011 18:32:38 +0000 (11:32 -0700)]
am 49a98c8f: Merge "Showing notifications after taking a screenshot (Bug: 5333706)" into ics-mr0

* commit '49a98c8f64d16eab3f2de48a04ac2a9e986abb76':
  Showing notifications after taking a screenshot (Bug: 5333706)

12 years agoam 541f6cfb: Merge "Add alarm volume to the list of volumes in the volume overlay...
Amith Yamasani [Mon, 17 Oct 2011 18:32:33 +0000 (11:32 -0700)]
am 541f6cfb: Merge "Add alarm volume to the list of volumes in the volume overlay." into ics-mr0

* commit '541f6cfba8d1beb240e841530a761a084e354f64':
  Add alarm volume to the list of volumes in the volume overlay.

12 years agoam 39268ffc: Format default locale the same way as those stored in prefs.
Narayan Kamath [Mon, 17 Oct 2011 18:32:25 +0000 (11:32 -0700)]
am 39268ffc: Format default locale the same way as those stored in prefs.

* commit '39268ffcb74f4c177e5e7427b66480c77743f928':
  Format default locale the same way as those stored in prefs.

12 years agoam 840b8a67: Revert "Add a LayerScreenshot"
Mathias Agopian [Mon, 17 Oct 2011 18:32:19 +0000 (11:32 -0700)]
am 840b8a67: Revert "Add a LayerScreenshot"

* commit '840b8a678537519c27ddf2f818494eaa20a135d4':
  Revert "Add a LayerScreenshot"

12 years agoam 4fb6416e: Merge "we need to guarantee that h/w comp set() is called when a buffer...
Mathias Agopian [Mon, 17 Oct 2011 18:32:16 +0000 (11:32 -0700)]
am 4fb6416e: Merge "we need to guarantee that h/w comp set() is called when a buffer has been retired" into ics-mr0

* commit '4fb6416e3a21031a88921a784ae62b13d8a1a39f':
  we need to guarantee that h/w comp set() is called when a buffer has been retired

12 years agoam fefffc68: Merge "add logging and defensive code when initializing sensors" into...
Mathias Agopian [Mon, 17 Oct 2011 18:32:15 +0000 (11:32 -0700)]
am fefffc68: Merge "add logging and defensive code when initializing sensors" into ics-mr0

* commit 'fefffc685ab703b44f6e32b5ec45292b22d370a3':
  add logging and defensive code when initializing sensors

12 years agoam bd9d2bcd: Whoops, remove left-over debug output.
Dianne Hackborn [Mon, 17 Oct 2011 18:32:12 +0000 (11:32 -0700)]
am bd9d2bcd: Whoops, remove left-over debug output.

* commit 'bd9d2bcdebfa66a0f71fa67aa256dcae4ccd93da':
  Whoops, remove left-over debug output.

12 years agoam cd8640fc: Merge "Fix issue #5398675: It\'s (too) easy to keep the navigation bar...
Dianne Hackborn [Mon, 17 Oct 2011 18:32:10 +0000 (11:32 -0700)]
am cd8640fc: Merge "Fix issue #5398675: It\'s (too) easy to keep the navigation bar..." into ics-mr0

* commit 'cd8640fc1a801349e863a7b6270a0702a63c014b':
  Fix issue #5398675: It's (too) easy to keep the navigation bar...

12 years agoam 7b5dd873: Fix 5466793: Fix memory leak in system process when face lock is enabled.
Jim Miller [Mon, 17 Oct 2011 18:32:08 +0000 (11:32 -0700)]
am 7b5dd873: Fix 5466793: Fix memory leak in system process when face lock is enabled.

* commit '7b5dd87351ac476dd872c51f9b819d2a3e572382':
  Fix 5466793: Fix memory leak in system process when face lock is enabled.

12 years agoMerge branch 'master' of ssh://android-git:29418/platform/frameworks/base
Elliott Hughes [Mon, 17 Oct 2011 18:32:08 +0000 (11:32 -0700)]
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base

12 years agoMerge changes I4e5ff00c,Id5e3ca1d,I97cbba61
Jamie Gennis [Mon, 17 Oct 2011 18:31:39 +0000 (11:31 -0700)]
Merge changes I4e5ff00c,Id5e3ca1d,I97cbba61

* changes:
  SurfaceFlinger: Remove display freezing code
  SurfaceFlinger: add some layer update tests
  SurfaceFlinger: make sync transactions explicit

12 years agoam e6b68036: New aapt feature to do smarter filtering of configurations.
Dianne Hackborn [Mon, 17 Oct 2011 18:31:35 +0000 (11:31 -0700)]
am e6b68036: New aapt feature to do smarter filtering of configurations.

* commit 'e6b680364dd992907a8d2037685a2e500d188dfb':
  New aapt feature to do smarter filtering of configurations.

12 years agoam d814d4fa: Merge "going directly to backup after face unlock fails 15 times" into...
Uriel Rodriguez [Mon, 17 Oct 2011 18:31:19 +0000 (11:31 -0700)]
am d814d4fa: Merge "going directly to backup after face unlock fails 15 times" into ics-mr0

* commit 'd814d4fa0c76a0384f7e32816e1ca36f237911c6':
  going directly to backup after face unlock fails 15 times

12 years agoam f755a2e8: Merge "docs: a couple notes for a11y methods in View and cleanup to...
Scott Main [Mon, 17 Oct 2011 18:30:58 +0000 (11:30 -0700)]
am f755a2e8: Merge "docs: a couple notes for a11y methods in View and cleanup to the A11y service HTML to be semantically correct and thus improve its accessibility :)" into ics-mr0

* commit 'f755a2e8aabfd6b26df4f3f56f0e9cdfb06cc173':
  docs: a couple notes for a11y methods in View and cleanup to the A11y service HTML to be semantically correct and thus improve its accessibility :)

12 years agoam b227cce3: Merge "Check MediaPlayer state, do not teardown() from UI thread." into...
Bart Sears [Mon, 17 Oct 2011 18:30:52 +0000 (11:30 -0700)]
am b227cce3: Merge "Check MediaPlayer state, do not teardown() from UI thread." into ics-mr0

* commit 'b227cce31641c39a1a586739561b4776019945a4':
  Check MediaPlayer state, do not teardown() from UI thread.

12 years agoam 57337eb7: Merge "Add a LayerScreenshot" into ics-mr0
Mathias Agopian [Mon, 17 Oct 2011 18:30:33 +0000 (11:30 -0700)]
am 57337eb7: Merge "Add a LayerScreenshot" into ics-mr0

* commit '57337eb78e65c160fb9c46a01e04c476d1bfdca1':
  Add a LayerScreenshot

12 years agoMerge "docs: revisions to api overview" into ics-mr0
Scott Main [Mon, 17 Oct 2011 18:26:59 +0000 (11:26 -0700)]
Merge "docs: revisions to api overview" into ics-mr0

12 years agoMerge "SurfaceTexture: report binder transaction failures" into ics-mr0
Jamie Gennis [Mon, 17 Oct 2011 18:25:46 +0000 (11:25 -0700)]
Merge "SurfaceTexture: report binder transaction failures" into ics-mr0

12 years agoMerge "Fix issue #5445666: bunch of com.android.server.TextServicesManagerService...
Dianne Hackborn [Mon, 17 Oct 2011 18:16:57 +0000 (11:16 -0700)]
Merge "Fix issue #5445666: bunch of com.android.server.TextServicesManagerService crashes" into ics-mr0

12 years agoMerge "Turn off chatty logging." into ics-mr0
Daniel Sandler [Mon, 17 Oct 2011 17:50:18 +0000 (10:50 -0700)]
Merge "Turn off chatty logging." into ics-mr0

12 years agoMerge "Issue 5432115: Speed up notification scrolling" into ics-mr0
Chet Haase [Mon, 17 Oct 2011 17:50:16 +0000 (10:50 -0700)]
Merge "Issue 5432115: Speed up notification scrolling" into ics-mr0

12 years agoMerge "Showing notifications after taking a screenshot (Bug: 5333706)" into ics-mr0
Winson Chung [Mon, 17 Oct 2011 17:20:46 +0000 (10:20 -0700)]
Merge "Showing notifications after taking a screenshot (Bug: 5333706)" into ics-mr0

12 years agoMerge "Add alarm volume to the list of volumes in the volume overlay." into ics-mr0
Amith Yamasani [Mon, 17 Oct 2011 16:42:52 +0000 (09:42 -0700)]
Merge "Add alarm volume to the list of volumes in the volume overlay." into ics-mr0

12 years agoMerge "Fix use of WebView.loadData() to avoid passing invalid encoding"
Steve Block [Mon, 17 Oct 2011 15:58:58 +0000 (08:58 -0700)]
Merge "Fix use of WebView.loadData() to avoid passing invalid encoding"

12 years agoam eaf49524: Merge "Moving text cursor to nodpi" into ics-mr0
Justin Ho [Mon, 17 Oct 2011 14:07:29 +0000 (07:07 -0700)]
am eaf49524: Merge "Moving text cursor to nodpi" into ics-mr0

* commit 'eaf4952410eb86d6ac8b343af3024250b9550dfd':
  Moving text cursor to nodpi

12 years agoam a3ffec23: Update stat_ icons
Peter Ng [Mon, 17 Oct 2011 14:07:27 +0000 (07:07 -0700)]
am a3ffec23: Update stat_ icons

* commit 'a3ffec23178922a48aee2ad10239ae79640b5bcd':
  Update stat_ icons

12 years agoam ff74b9c8: Merge "Fix 5458658: Fix memory leak in lock screen" into ics-mr0
Jim Miller [Mon, 17 Oct 2011 14:07:18 +0000 (07:07 -0700)]
am ff74b9c8: Merge "Fix 5458658: Fix memory leak in lock screen" into ics-mr0

* commit 'ff74b9c88400a14b1faa43c514aac348674ca685':
  Fix 5458658: Fix memory leak in lock screen