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
The Android Automerger
7672cc2c31
merge in ics-mr0-release history after reset to ics-mr0
2011-10-17 06:27:58 -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
1a2b83a17d
SensorManager reconnects to sensor service when the later dies
...
if system process ever restarted, processes using a SensorManager
would loose the ability to use it, resulting to a crash.
we now listen for sensor service death and reconnected if necessary.
Bug: 5445240
Change-Id: Ia47f8b26cdcecb729fa22bf11d55e10fcaef8cfc
2011-10-16 22:15:23 -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
The Android Automerger
f7d4038599
merge in ics-mr0-release history after reset to ics-mr0
2011-10-16 16:52:18 -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
The Android Automerger
d228939064
merge in ics-mr0-release history after reset to ics-mr0
2011-10-16 06:28:20 -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
The Android Automerger
e2c1f9737a
merge in ics-mr0-release history after reset to ics-mr0
2011-10-14 21:57:25 -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
Jeff Brown
547826d718
Merge "AbstractWindowedCursor is not special."
2011-10-14 21:06:15 -07:00
Jeff Brown
32f7ee638c
Merge "Make default implementation of fillWindow typesafe. Bug: 5218310"
2011-10-14 21:06:08 -07:00
Jeff Brown
9f61c8adca
Merge "Deprecate local-only CursorWindows."
2011-10-14 21:05:58 -07:00
Scott Main
94ef50a109
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
2011-10-14 17:19:17 -07:00
Jamie Gennis
a402c4c991
SurfaceFlinger: Remove display freezing code
...
This change removes the dead code from SurfaceFlinger that resulted from
disabling support for freezing the display.
Change-Id: I4e5ff00c94b4c7a79af2f65c9850c135210068ed
2011-10-14 16:44:08 -07:00
Jamie Gennis
23c2c5d1c6
SurfaceFlinger: add some layer update tests
...
This change adds two tests for SurfaceFlinger's behavior when updating
the position and size of a layer.
Change-Id: Id5e3ca1d7e629a3bd2c2d28275d80c7f9256d6da
2011-10-14 16:11:51 -07:00
Jamie Gennis
28378392fd
SurfaceFlinger: make sync transactions explicit
...
This change enables a layer or orientation update transaction sent to
SurfaceFlinger to explicitly request a synchronous transaction.
Change-Id: I97cbba610c13679849f66114b216fa6dbf12f2a9
2011-10-14 16:11:51 -07:00
Bart Sears
2b9a328905
Merge "Check MediaPlayer state, do not teardown() from UI thread." into ics-mr0
2011-10-14 16:09:46 -07:00
Romain Guy
12aeb08b7f
Merge "Disable hardware acceleration for apps in compatibility mode"
2011-10-14 15:48:40 -07:00
Mathias Agopian
f02e72a5b2
Merge "Add a LayerScreenshot" into ics-mr0
2011-10-14 15:35:54 -07:00
Jamie Gennis
8a29ff2a35
SurfaceTexture: report binder transaction failures
...
This change fixes the ISurfaceTexture error reporting for the case where
the binder transaction fails.
Bug: 5082219
Change-Id: I6517532992e3a76dc9eb5e4a36af43a562391aaa
2011-10-14 15:17:07 -07:00
Justin Ho
d94485b930
Merge "Moving text cursor to nodpi" into ics-mr0
2011-10-14 15:12:13 -07:00
Jim Miller
3a720efd9d
Merge "Fix 5458658: Fix memory leak in lock screen" into ics-mr0
2011-10-14 14:51:56 -07:00
Justin Ho
c9fe086501
Merge "Updating numberpicker assets" into ics-mr0
2011-10-14 14:41:45 -07:00
Justin Ho
c88a8c394e
Merge "Updated codelock assets" into ics-mr0
2011-10-14 14:41:37 -07:00
Justin Ho
ca76a06900
Merge "Update presence away asset" into ics-mr0
2011-10-14 14:41:28 -07:00
Justin Ho
f073a21caa
Merge "Update list selector background (disabled state)" into ics-mr0
2011-10-14 14:36:03 -07:00
Justin Ho
a95f153897
Merge "Update share pack assets" into ics-mr0
2011-10-14 14:35:54 -07:00
Mathias Agopian
f171ab6da9
Add a LayerScreenshot
...
A LayerScreenshot is a special type of layer that contains a screenshot of
the screen acquired when its created. It works just like LayerDim.
Bug: 5446982
Change-Id: I7814aff2380e7e146937f2b641907be2a30c76cc
2011-10-14 14:32:48 -07:00