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
Steve Block
bddddf4729
Merge "Fix use of WebView.loadData() to avoid passing invalid encoding"
2011-10-17 08:58:58 -07:00
Steve Block
136b1637f8
Fix use of WebView.loadData() to avoid passing invalid encoding
...
No change in behavior, as invalid encodings have always been ignored.
Bug: 5125738
Change-Id: I23f21ca65a6b14501c74dc2189a55643f1e33c33
2011-10-17 15:11:33 +01:00
Justin Ho
37b3239343
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
9be02f66a5
am a3ffec23: Update stat_ icons
...
* commit 'a3ffec23178922a48aee2ad10239ae79640b5bcd':
Update stat_ icons
2011-10-17 07:07:27 -07:00
Jim Miller
817a55b20f
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
6aa942a2b3
am ccf29b4c: Merge "Updating numberpicker assets" into ics-mr0
...
* commit 'ccf29b4c03422a858a2fcc644e3d2ecbcc555208':
Updating numberpicker assets
2011-10-17 07:07:16 -07:00
Justin Ho
494c5e3e51
am a6389a9c: Merge "Updated codelock assets" into ics-mr0
...
* commit 'a6389a9c1e1a50fe040961dfead76102b530b149':
Updated codelock assets
2011-10-17 07:07:14 -07:00
Justin Ho
3f6a7c275c
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
0ce59db8d9
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
aab13cd208
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
5e6889cb1c
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
8287825350
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
98f05931ad
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
73963d95ad
am 269c64de: Merge "Update lockscreen assets" into ics-mr0
...
* commit '269c64de8817e158e9ae49ea489344fbfc46f160':
Update lockscreen assets
2011-10-17 07:07:00 -07:00
Justin Ho
6e0747eaf4
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
b22a69f2ca
Build fix
...
Fix after https://android-git.corp.google.com/g/#/c/125775
Bug: 5461416
Change-Id: Ifee29b287c9fcd2a35b0b676db00ef2a4fc8c5a8
2011-10-17 12:25:00 +01:00
Steve Block
cfece91c1e
Merge "Improve documentation for WebChromeClient.onCreateWindow()"
2011-10-17 02:30:41 -07:00
Steve Block
3593414863
Merge "Clean up documentation for WebView.loadUrl()"
2011-10-17 02:30:00 -07:00
Steve Block
f71dea025a
Clean up documentation for WebView.loadUrl()
...
Bug: 5461416
Change-Id: I3bb6ac4abab7def8e06de087c5ae7be906bc962e
2011-10-17 10:29:03 +01:00
Mathias Agopian
840b8a6785
Revert "Add a LayerScreenshot"
...
This reverts commit d6809f40cf61203573ec5dbc437f695cd132cc18.
2011-10-16 23:54:25 -07:00
Mathias Agopian
4fb6416e3a
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
fefffc685a
Merge "add logging and defensive code when initializing sensors" into ics-mr0
2011-10-16 21:07:42 -07:00
Mathias Agopian
e757a87ff1
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
bd9d2bcdeb
Whoops, remove left-over debug output.
...
Change-Id: Ib30571b22a6750629f975319a403d38de5e9462c
2011-10-16 14:17:07 -07:00
Dianne Hackborn
cd8640fc1a
Merge "Fix issue #5398675 : It's (too) easy to keep the navigation bar..." into ics-mr0
2011-10-16 14:15:21 -07:00
Dianne Hackborn
e26ab70de2
Fix issue #5398675 : It's (too) easy to keep the navigation bar...
...
...from ever becoming visible
Now there is a 1 second delay from when the user dismisses the nav bar
until when it can be re-hidden.
Also move the code for capturing touch events while nav bar is hidden
out to be used even when there is no nav bar, so this API behaves
consistently across devices whether or not they have some element of
the UI that is being hidden. On devices with a nav bar, this will
all work the same as prime (the flag is set, the app gets the callback
about the flag being set, when the user touches that touch is captured
so the app doesn't see it put does clear the flag and tell the app
about this).
Change-Id: Icb5ea0ddaf614aa3f12d2140796217f128761dee
2011-10-16 13:21:33 -07:00
Jim Miller
7b5dd87351
Fix 5466793: Fix memory leak in system process when face lock is enabled.
...
Previously, the code was not unregistering the callback when we unlocked
the device, which kept a reference to LockPatternKeyguardView indirectly
by a reference to mFaceLockCallback.
It now correcly removes the callback when we unlock the device.
Change-Id: Ie592d007a1dfc2416b9e8956aba2c34e3d0120ee
2011-10-16 12:46:06 -07:00
Alex Sakhartchouk
a744ead977
Merge "Adding getter functions for script side RS objects. Multiproject change involving on device linker"
2011-10-16 12:13:18 -07:00
Dianne Hackborn
e6b680364d
New aapt feature to do smarter filtering of configurations.
...
This adds a --preferred-configurations flag that specifies the
specific configurations you would like to have.
It is smarter than "-c" because it will avoid stripping a
configuration if that would result in there being no value
for the resource.
It is dumber than "-c" because it can't process as many kinds
of resources. It is really only intended for bitmaps and use
with density configs.
This required re-arranging AaptAssets to group files together
by config again, like they used to be. I think this hasn't
broken anything. Hopefully.
Change-Id: I4e9d12ff6e6dbd1abb8fd4cb1814c6674b19d0e5
2011-10-16 11:52:17 -07:00
Mathias Agopian
a338379873
add logging and defensive code when initializing sensors
...
Bug: 5445240
Change-Id: I9dc7d27d3e8b4f15989488859831526d8c7ded3b
2011-10-16 00:38:30 -07:00
Alex Sakhartchouk
7e6aac1533
Adding getter functions for script side RS objects.
...
Multiproject change involving on device linker
Change-Id: I321e8caa6ca23b3fe2c96c78cdcfc15e51f88823
2011-10-15 09:33:05 -07:00
Uriel Rodriguez
d814d4fa0c
Merge "going directly to backup after face unlock fails 15 times" into ics-mr0
2011-10-15 08:44:21 -07:00
Jeff Brown
6aa1e80e4f
Merge "Use MatrixCursor instead of ArrayListCursor."
2011-10-14 21:06:31 -07:00
Jeff Brown
aac01f699f
Merge "Add a CrossProcessCursorWrapper. Bug: 5220669"
2011-10-14 21:06:22 -07:00
Jeff Brown
04263dc591
Merge "AbstractWindowedCursor is not special."
2011-10-14 21:06:15 -07:00
Jeff Brown
d00851082f
Merge "Make default implementation of fillWindow typesafe. Bug: 5218310"
2011-10-14 21:06:08 -07:00
Jeff Brown
a39a055304
Merge "Deprecate local-only CursorWindows."
2011-10-14 21:05:58 -07:00