ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
40,016 Commits 2 Branches 0 Tags 54 MiB
12db4b79e2
Commit Graph

40016 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
8d11405ed8 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
5ac9271214 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
2809a5fc18 Merge "docs: nfc updates" 2011-10-17 15:23:18 -07:00
Claudia de Veaux
09e2beb7db Merge "String edits to bring to standards. Bugs: 5165745, 5163232, 5162668, 5162667, 5162328" 2011-10-17 14:05:36 -07:00
Jamie Gennis
ee38a494eb 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
56e96c8c88 Merge "MediaPlayer: properly handle released surfaces" into ics-mr0 2011-10-17 12:38:36 -07:00
The Android Open Source Project
056183c9db Reconcile with ics-mr0-release 
Change-Id: Id91d1990671b3bb8778b0bac178a36e63f7c7b8a
 2011-10-17 12:20:06 -07:00
Peter Ng
e3dc3bc52c 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
9495156871 Merge "Layout changes to recents" into ics-mr0 2011-10-17 11:57:38 -07:00
Scott Main
f05230988a 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
31218730d4 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
b6f6c593de 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
6ed045b0de 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
edfc88c1c8 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
5bc83affec 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
ecd3dc2250 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
a907b70996 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
cdec8f01aa am 840b8a67: Revert "Add a LayerScreenshot" 
* commit '840b8a678537519c27ddf2f818494eaa20a135d4':
  Revert "Add a LayerScreenshot"
 2011-10-17 11:32:19 -07:00
Mathias Agopian
5bacca6238 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
2532077bb6 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
74bd2167f2 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
187ec6ef78 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
3107a91ec5 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
090cb44b94 Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base 2011-10-17 11:32:08 -07:00
Jamie Gennis
cb2de7182e 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
35e9fa4891 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
97dfe72604 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
84cbfebcfe 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
86f26506a1 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
c33f784c4b am 57337eb7: Merge "Add a LayerScreenshot" into ics-mr0 
* commit '57337eb78e65c160fb9c46a01e04c476d1bfdca1':
  Add a LayerScreenshot
 2011-10-17 11:30:33 -07:00
Scott Main
690676d72e Merge "docs: revisions to api overview" into ics-mr0 2011-10-17 11:26:59 -07:00
Jamie Gennis
8e42e48f4e Merge "SurfaceTexture: report binder transaction failures" into ics-mr0 2011-10-17 11:25:46 -07:00
Dianne Hackborn
15e298bb05 Merge "Fix issue #5445666: bunch of com.android.server.TextServicesManagerService crashes" into ics-mr0 2011-10-17 11:16:57 -07:00
Daniel Sandler
cc55fd4fee Merge "Turn off chatty logging." into ics-mr0 2011-10-17 10:50:18 -07:00
Chet Haase
b871b0855c Merge "Issue 5432115: Speed up notification scrolling" into ics-mr0 2011-10-17 10:50:16 -07:00
Winson Chung
fa0b9fab79 Merge "Showing notifications after taking a screenshot (Bug: 5333706)" into ics-mr0 2011-10-17 10:20:46 -07:00
Amith Yamasani
c8845c16a5 Merge "Add alarm volume to the list of volumes in the volume overlay." into ics-mr0 2011-10-17 09:42:52 -07:00
Steve Block
a261e74eab Merge "Fix use of WebView.loadData() to avoid passing invalid encoding" 2011-10-17 08:58:58 -07:00
Justin Ho
0fc55c79e3 am eaf49524: Merge "Moving text cursor to nodpi" into ics-mr0 
* commit 'eaf4952410eb86d6ac8b343af3024250b9550dfd':
  Moving text cursor to nodpi
 2011-10-17 07:07:29 -07:00
Peter Ng
f94183aab2 am a3ffec23: Update stat_ icons 
* commit 'a3ffec23178922a48aee2ad10239ae79640b5bcd':
  Update stat_ icons
 2011-10-17 07:07:27 -07:00
Jim Miller
ed5b25aa52 am ff74b9c8: Merge "Fix 5458658: Fix memory leak in lock screen" into ics-mr0 
* commit 'ff74b9c88400a14b1faa43c514aac348674ca685':
  Fix 5458658: Fix memory leak in lock screen
 2011-10-17 07:07:18 -07:00
Justin Ho
f5d93d9edf am ccf29b4c: Merge "Updating numberpicker assets" into ics-mr0 
* commit 'ccf29b4c03422a858a2fcc644e3d2ecbcc555208':
  Updating numberpicker assets
 2011-10-17 07:07:16 -07:00
Justin Ho
c7fe22196a am a6389a9c: Merge "Updated codelock assets" into ics-mr0 
* commit 'a6389a9c1e1a50fe040961dfead76102b530b149':
  Updated codelock assets
 2011-10-17 07:07:14 -07:00
Justin Ho
f360afdd75 am af951c17: Merge "Update presence away asset" into ics-mr0 
* commit 'af951c17e75b378a382dc4e7fefa7464f7bdfddb':
  Update presence away asset
 2011-10-17 07:07:11 -07:00
Justin Ho
a2e8871d00 am 52670cd4: Merge "Update list selector background (disabled state)" into ics-mr0 
* commit '52670cd4f73aa28a72dc1df4e7fa92fb0d972781':
  Update list selector background (disabled state)
 2011-10-17 07:07:10 -07:00
Justin Ho
ead3d1540b am 3c2bbc24: Merge "Update share pack assets" into ics-mr0 
* commit '3c2bbc2406e491b11e16b9f8bb0495d433097d52':
  Update share pack assets
 2011-10-17 07:07:08 -07:00
Scott Main
7214a35396 am 8009752d: Merge "fix android beam demo path" into ics-mr0 
* commit '8009752da64f5c6ec4df4f1737032bba74ebb2a4':
  fix android beam demo path
 2011-10-17 07:07:05 -07:00
Justin Ho
7dbf4eaf7b am 686420a4: Merge "Update rating star buttons" into ics-mr0 
* commit '686420a40e2bfd7c701cba9748d4771315dcd1cc':
  Update rating star buttons
 2011-10-17 07:07:04 -07:00
Justin Ho
e8317bd699 am cd8f69dd: Merge "Update unlock halo asset" into ics-mr0 
* commit 'cd8f69dd84306267db23426c538f86b577d82511':
  Update unlock halo asset
 2011-10-17 07:07:02 -07:00
Justin Ho
7e9418f6e1 am 269c64de: Merge "Update lockscreen assets" into ics-mr0 
* commit '269c64de8817e158e9ae49ea489344fbfc46f160':
  Update lockscreen assets
 2011-10-17 07:07:00 -07:00