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
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
Justin Ho
5f58d5c88f
am 41c5a607: Merge "Update bullet permission asset" into ics-mr0
...
* commit '41c5a607498b8922105ba9dfeb6adf8dd0a82050':
Update bullet permission asset
2011-10-17 07:06:57 -07:00
Steve Block
11bd3ab294
Merge "Improve documentation for WebChromeClient.onCreateWindow()"
2011-10-17 02:30:41 -07:00
Steve Block
121228444f
Merge "Clean up documentation for WebView.loadUrl()"
2011-10-17 02:30:00 -07:00
Mathias Agopian
e9800c8311
Revert "Add a LayerScreenshot"
...
This reverts commit d6809f40cf61203573ec5dbc437f695cd132cc18.
2011-10-16 23:54:25 -07:00
Mathias Agopian
1d011ec8dd
Merge "we need to guarantee that h/w comp set() is called when a buffer has been retired" into ics-mr0
2011-10-16 21:08:00 -07:00
Mathias Agopian
286afc96ec
Merge "add logging and defensive code when initializing sensors" into ics-mr0
2011-10-16 21:07:42 -07:00
Mathias Agopian
a44b041639
we need to guarantee that h/w comp set() is called when a buffer has been retired
...
removed a test that could violate this guarantee. note that we
have no proof tha this ever happened, but consequences could be
hard lock-ups.
the code here was intended to track the region to update for displays
that can do partial update. the logic discarded the update entirely
if that region was empty. instead we just redraw the whole thing
(note that we should never be there with an empty region and retired
buffers though).
Bug: 5466259
Change-Id: I91ccab3b1a599e729e438eb833939e2236da6854
2011-10-16 18:59:38 -07:00
Dianne Hackborn
1c00a8bdf1
Merge "Fix issue #5398675 : It's (too) easy to keep the navigation bar..." into ics-mr0
2011-10-16 14:15:21 -07:00
Alex Sakhartchouk
82515cc1b6
Merge "Adding getter functions for script side RS objects. Multiproject change involving on device linker"
2011-10-16 12:13:18 -07:00
Mathias Agopian
be58de0d62
add logging and defensive code when initializing sensors
...
Bug: 5445240
Change-Id: I9dc7d27d3e8b4f15989488859831526d8c7ded3b
2011-10-16 00:38:30 -07:00
Uriel Rodriguez
00f99e88c8
Merge "going directly to backup after face unlock fails 15 times" into ics-mr0
2011-10-15 08:44:21 -07:00
Jeff Brown
36c5393af2
Merge "Use MatrixCursor instead of ArrayListCursor."
2011-10-14 21:06:31 -07:00
Jeff Brown
ebb7702666
Merge "Add a CrossProcessCursorWrapper. Bug: 5220669"
2011-10-14 21:06:22 -07:00