Justin Ho
6ce0a07ea7
am 5f94580c: Merge "Update default app icon" into ics-mr0
...
* commit '5f94580c93031c515fffb80a350430cd7bde434d':
Update default app icon
2011-10-17 15:54:25 -07:00
Robert Ly
f3fb6cec28
am ffaab837: Merge "docs: adt and tools filesizes and md5sums" into ics-mr0
...
* commit 'ffaab837e7686fa81ab20e1fed32d33c684a295e':
docs: adt and tools filesizes and md5sums
2011-10-17 15:54:24 -07:00
Justin Ho
5f94580c93
Merge "Update default app icon" into ics-mr0
2011-10-17 15:53:00 -07:00
Robert Ly
ffaab837e7
Merge "docs: adt and tools filesizes and md5sums" into ics-mr0
2011-10-17 15:52:51 -07:00
Mathias Agopian
72cdc6d488
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
2011-10-17 15:52:31 -07:00
Mathias Agopian
9a0732af1b
Merge "SensorManager reconnects to sensor service when the later dies" into ics-mr0
2011-10-17 15:50:36 -07:00
Robert Ly
7bbbd39478
docs: adt and tools filesizes and md5sums
...
Change-Id: I809124c0953bed0a654999e34a861703a775c7f1
2011-10-17 15:46:56 -07:00
Justin Ho
b4890c305f
Update default app icon
...
Change-Id: I4b958db049d96c40d64ebed01ffa6c9f3bfd8d98
2011-10-17 15:40:45 -07:00
Jeff Sharkey
2789e257fc
am 31603aac: Merge "Validate commands and arguments." into ics-mr0
...
* commit '31603aacbb54b98cbee498412f6a5eb9dd4a2788':
Validate commands and arguments.
2011-10-17 15:31:10 -07:00
Jeff Sharkey
31603aacbb
Merge "Validate commands and arguments." into ics-mr0
2011-10-17 15:29:25 -07:00
Dianne Hackborn
46428314bf
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.
2011-10-17 15:28:07 -07:00
Dianne Hackborn
5d199737cb
Merge "Fix stupid bug breaking touch on devices without a nav bar." into ics-mr0
2011-10-17 15:26:18 -07:00
Robert Ly
9780ff1274
Merge "docs: nfc updates"
2011-10-17 15:23:18 -07:00
Dianne Hackborn
05f1cdc3e9
Fix stupid bug breaking touch on devices without a nav bar.
...
Change-Id: Id76b7ab5625470fcc72541fb2fe8845cddba523f
2011-10-17 15:02:25 -07:00
Jeff Sharkey
b0aec07f74
Validate commands and arguments.
...
Bug: 5465176
Change-Id: I9402054c20ea6cae42781c35bfc2ade90aac31ce
2011-10-17 14:51:42 -07:00
Claudia de Veaux
8576d7da98
Merge "String edits to bring to standards. Bugs: 5165745, 5163232, 5162668, 5162667, 5162328"
2011-10-17 14:05:36 -07:00
Claudia de Veaux
b837c7a948
String edits to bring to standards.
...
Bugs: 5165745, 5163232, 5162668, 5162667, 5162328
Change-Id: I6dbe1ea100397e4cfa98997928ff1662728b6e9c
2011-10-17 13:36:00 -07:00
Robert Ly
56b5dc6ad7
docs: nfc updates
...
Change-Id: Iaa782911f14b11bc896ac9ef06db2c43104d1dac
2011-10-17 13:35:11 -07:00
Jamie Gennis
29fe8cb941
am c4de6f81: Merge "MediaPlayer: properly handle released surfaces" into ics-mr0
...
* commit 'c4de6f81d4533acbfc162d051de480d474b72e76':
MediaPlayer: properly handle released surfaces
2011-10-17 12:40:49 -07:00
Jamie Gennis
c4de6f81d4
Merge "MediaPlayer: properly handle released surfaces" into ics-mr0
2011-10-17 12:38:36 -07:00
The Android Open Source Project
9757440700
Reconcile with ics-mr0-release
...
Change-Id: Id91d1990671b3bb8778b0bac178a36e63f7c7b8a
2011-10-17 12:20:06 -07:00
Peter Ng
acbfe5e3ed
am 63fae9d5: Merge "Layout changes to recents" into ics-mr0
...
* commit '63fae9d56286e7c51261a5a00755466b350efa33':
Layout changes to recents
2011-10-17 11:58:54 -07:00
Peter Ng
63fae9d562
Merge "Layout changes to recents" into ics-mr0
2011-10-17 11:57:38 -07:00
Scott Main
36757f49db
am ca3c8a97: Merge "docs: revisions to api overview" into ics-mr0
...
* commit 'ca3c8a9703ccde66570f0130bb3a8863dd53e4b6':
docs: revisions to api overview
2011-10-17 11:35:54 -07:00
Jamie Gennis
eb587070b9
am 3a735078: Merge "SurfaceTexture: report binder transaction failures" into ics-mr0
...
* commit '3a73507801b56da83140fad14a1a3d4eced213d9':
SurfaceTexture: report binder transaction failures
2011-10-17 11:35:53 -07:00
Dianne Hackborn
88217fea8a
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
2011-10-17 11:32:51 -07:00
Daniel Sandler
6083aea070
am 61e980d6: Merge "Turn off chatty logging." into ics-mr0
...
* commit '61e980d6187aa052e92387d7b12b3179a9427db4':
Turn off chatty logging.
2011-10-17 11:32:47 -07:00
Chet Haase
5b2dfbde53
am 1aad3b5e: Merge "Issue 5432115: Speed up notification scrolling" into ics-mr0
...
* commit '1aad3b5e336a04ed612c091d8002569f959e1722':
Issue 5432115: Speed up notification scrolling
2011-10-17 11:32:45 -07:00
Winson Chung
e0773c92e8
am 49a98c8f: Merge "Showing notifications after taking a screenshot (Bug: 5333706)" into ics-mr0
...
* commit '49a98c8f64d16eab3f2de48a04ac2a9e986abb76':
Showing notifications after taking a screenshot (Bug: 5333706)
2011-10-17 11:32:38 -07:00
Amith Yamasani
06a77ad5ba
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.
2011-10-17 11:32:33 -07:00
Narayan Kamath
4235d34d49
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.
2011-10-17 11:32:25 -07:00
Mathias Agopian
a3dca6fdaa
am 840b8a67: Revert "Add a LayerScreenshot"
...
* commit '840b8a678537519c27ddf2f818494eaa20a135d4':
Revert "Add a LayerScreenshot"
2011-10-17 11:32:19 -07:00
Mathias Agopian
f7ae86f61b
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
2011-10-17 11:32:16 -07:00
Mathias Agopian
1c8a6bf3b2
am fefffc68: Merge "add logging and defensive code when initializing sensors" into ics-mr0
...
* commit 'fefffc685ab703b44f6e32b5ec45292b22d370a3':
add logging and defensive code when initializing sensors
2011-10-17 11:32:15 -07:00
Dianne Hackborn
4bb7572e76
am bd9d2bcd: Whoops, remove left-over debug output.
...
* commit 'bd9d2bcdebfa66a0f71fa67aa256dcae4ccd93da':
Whoops, remove left-over debug output.
2011-10-17 11:32:12 -07:00
Dianne Hackborn
36dea89057
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...
2011-10-17 11:32:10 -07:00
Jim Miller
eb4173ae29
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.
2011-10-17 11:32:08 -07:00
Elliott Hughes
f21dd1eabe
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base
2011-10-17 11:32:08 -07:00
Jamie Gennis
7f7362c02b
Merge changes I4e5ff00c,Id5e3ca1d,I97cbba61
...
* changes:
SurfaceFlinger: Remove display freezing code
SurfaceFlinger: add some layer update tests
SurfaceFlinger: make sync transactions explicit
2011-10-17 11:31:39 -07:00
Dianne Hackborn
c831f6c979
am e6b68036: New aapt feature to do smarter filtering of configurations.
...
* commit 'e6b680364dd992907a8d2037685a2e500d188dfb':
New aapt feature to do smarter filtering of configurations.
2011-10-17 11:31:35 -07:00
Uriel Rodriguez
af0aec584a
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
2011-10-17 11:31:19 -07:00
Scott Main
82ced8250f
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 :)
2011-10-17 11:30:58 -07:00
Bart Sears
b29553e5b0
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.
2011-10-17 11:30:52 -07:00
Mathias Agopian
4b1415ebd9
am 57337eb7: Merge "Add a LayerScreenshot" into ics-mr0
...
* commit '57337eb78e65c160fb9c46a01e04c476d1bfdca1':
Add a LayerScreenshot
2011-10-17 11:30:33 -07:00
Scott Main
ca3c8a9703
Merge "docs: revisions to api overview" into ics-mr0
2011-10-17 11:26:59 -07:00
Jamie Gennis
3a73507801
Merge "SurfaceTexture: report binder transaction failures" into ics-mr0
2011-10-17 11:25:46 -07:00
Scott Main
b57769a738
docs: revisions to api overview
...
Change-Id: If23f1119290d93494a6bec7021ecdc7e354b0504
2011-10-17 11:24:40 -07:00
Dianne Hackborn
c047f60db2
Merge "Fix issue #5445666 : bunch of com.android.server.TextServicesManagerService crashes" into ics-mr0
2011-10-17 11:16:57 -07:00
Daniel Sandler
61e980d618
Merge "Turn off chatty logging." into ics-mr0
2011-10-17 10:50:18 -07:00
Chet Haase
1aad3b5e33
Merge "Issue 5432115: Speed up notification scrolling" into ics-mr0
2011-10-17 10:50:16 -07:00