fc03504838
am b921072c: Fix bug 3356144 - Alert dialog in Holo Dark theme has wrong height
...
* commit 'b921072c2b509cf31d9d9779b30c278bc6f9f640':
Fix bug 3356144 - Alert dialog in Holo Dark theme has wrong height
2011-01-15 19:29:30 -08:00
e6672786ce
am 115ad165: Merge "Fix bug 3355197 - Add attribute for fast scroll preview panel text color." into honeycomb
...
* commit '115ad16551c9cf9551f44cbea59f3edf83e4a340':
Fix bug 3355197 - Add attribute for fast scroll preview panel text color.
2011-01-15 17:25:49 -08:00
6b5fa98576
Merge "Fix bug 3355197 - Add attribute for fast scroll preview panel text color." into honeycomb
2011-01-15 17:23:39 -08:00
1cec8c0c15
am 39de4584: Merge "Compare GraphicBuffers using handles." into honeycomb
...
* commit '39de45846cd9431e9fc1ee44591152bc566f9858':
Compare GraphicBuffers using handles.
2011-01-15 17:03:28 -08:00
361dcc75b1
Merge "Compare GraphicBuffers using handles." into honeycomb
2011-01-15 17:01:51 -08:00
73e8b9e524
Compare GraphicBuffers using handles.
...
This change fixes a bug in SurfaceTextureClient where GraphicBuffers
were being compared using pointer comparison rather than handles.
Change-Id: Ib8989af94be32d4efd86e020a732f5143088a863
2011-01-15 17:00:06 -08:00
bb0039c598
am 80a44401: Need to update the largeIcon for notifications when we\'re reapplying the views.
...
* commit '80a44401a22344f7eabce6976372ab144ef22893':
Need to update the largeIcon for notifications when we're reapplying the views.
2011-01-15 16:25:46 -08:00
67a5c2aa21
am a47aa87a: Merge "Set mIsMinInfoReady and mCurrentOtasp before notifcations." into honeycomb
...
* commit 'a47aa87a19c733e28d9d2db1c4eb7f29d668db7b':
Set mIsMinInfoReady and mCurrentOtasp before notifcations.
2011-01-15 10:13:07 -08:00
bcb3e57eef
Merge "Set mIsMinInfoReady and mCurrentOtasp before notifcations." into honeycomb
2011-01-15 10:11:08 -08:00
2fd77c349a
am f780350e: am b73203ab: Merge "Make sure service handles are live before passing to other objects." into gingerbread
...
* commit 'f780350edb403739fee1a99b0ca91541f5ec0b91':
Make sure service handles are live before passing to other objects.
2011-01-14 21:30:20 -08:00
8e3c15e8d7
am 9286cfe5: (-s ours) merge 83fdc69e from gingerbread - do not merge
...
* commit '9286cfe5017363d95798d85163ec4f28aeb0c675':
Squash commits of the following patches, cherry-picked from other branch - do not merge.
2011-01-14 21:30:16 -08:00
bf403ce6bd
am ef6abd8a: (-s ours) am a788a943: Merge "Do Not Merge: Expose insecure rfcomm Bluetooth API." into gingerbread
...
* commit 'ef6abd8a3e4b05cb9d94f29f4e8ffc7bb2ecec77':
Do Not Merge: Expose insecure rfcomm Bluetooth API.
2011-01-14 21:30:06 -08:00
abd95f3ca7
am dd4a1e38: am 7d234fab: Merge "Don\'t drop the drawable cache completely on configuration change"
...
* commit 'dd4a1e3825f4f379ba36fd721f78de0101bb1833':
Don't drop the drawable cache completely on configuration change
2011-01-14 21:29:59 -08:00
3ff09c8d9d
am 1e6f5f04: am c3d0d860: Merge "Make the Phone options dialog use current language"
...
* commit '1e6f5f0453a2be0553de39c3b6f97da7c66b0b3b':
Make the Phone options dialog use current language
2011-01-14 21:29:48 -08:00
4037164041
am e1d12668: am 0950a3ef: Merge "Added check to make orientation calculations more robust"
...
* commit 'e1d12668c1f443b1c71b5e78587353dffa5b1774':
Added check to make orientation calculations more robust
2011-01-14 21:29:43 -08:00
8cf340de98
am 544ff558: am 29c99aaa: Merge "Added check to make orientation calculations more robust" into gingerbread
...
* commit '544ff558a80912d968570494363cea6540c08dd3':
Added check to make orientation calculations more robust
2011-01-14 21:29:32 -08:00
979f846a2f
am ff3a2c18: am c058bf00: Merge "Make the Phone options dialog use current language" into gingerbread
...
* commit 'ff3a2c18924bffa76207fb1ba8b5e79f860c4867':
Make the Phone options dialog use current language
2011-01-14 21:29:26 -08:00
90f21dcf70
am 2e7fbd97: Merge "Preapre region tracking in layers" into honeycomb
...
* commit '2e7fbd97e6f3682b20631d4f5262321dba6e2c6f':
Preapre region tracking in layers
2011-01-14 20:06:18 -08:00
1c3b24baf1
Merge "Preapre region tracking in layers" into honeycomb
2011-01-14 20:04:42 -08:00
f2c8275042
am fd7a411a: Merge "partially fix [3306150] HTML5 video with H/W acceleration blackout" into honeycomb
...
* commit 'fd7a411aef7e1c7722456de09b3f3234bbb914d4':
partially fix [3306150] HTML5 video with H/W acceleration blackout
2011-01-14 19:29:44 -08:00
8bf5772af1
am a7393dd6: Merge "Fix error reporting in Surface::cancelBuffer()" into honeycomb
...
* commit 'a7393dd66f0127c8acdd5f8928b0c2d0de602275':
Fix error reporting in Surface::cancelBuffer()
2011-01-14 19:29:40 -08:00
0d3dcc4aab
Merge "partially fix [3306150] HTML5 video with H/W acceleration blackout" into honeycomb
2011-01-14 19:27:38 -08:00
b353fd9746
Merge "Fix error reporting in Surface::cancelBuffer()" into honeycomb
2011-01-14 19:27:32 -08:00
b540b82564
am e7df0dde: Merge "Fixed thrashing in the cached buffer during 720p YT video streaming" into honeycomb
...
* commit 'e7df0ddee486f4705b17b4d8ed57ddbeb8b71943':
Fixed thrashing in the cached buffer during 720p YT video streaming
2011-01-14 19:22:26 -08:00
c9c000db86
am 7a1c32e7: Merge "Add support for detecting finger orientation." into honeycomb
...
* commit '7a1c32e719725787acda4885ad7bd8031975e8c7':
Add support for detecting finger orientation.
2011-01-14 19:20:07 -08:00
e58a41aa4d
Merge "Fixed thrashing in the cached buffer during 720p YT video streaming" into honeycomb
2011-01-14 19:19:41 -08:00
a2690eca91
Merge "Add support for detecting finger orientation." into honeycomb
2011-01-14 19:18:16 -08:00
136ce8954d
am 0a26f3ce: Merge "New tray notification icons, new system bar icons" into honeycomb
...
* commit '0a26f3ce96c628a22892b09b69bcbb58cc700165':
New tray notification icons, new system bar icons
2011-01-14 19:03:50 -08:00
d74787181b
Merge "New tray notification icons, new system bar icons" into honeycomb
2011-01-14 19:01:58 -08:00
ee19dec219
am 739e34a3: Merge "Don\'t crash Launcher on config change." into honeycomb
...
* commit '739e34a362518020b4aed3f2dc54be2154c41406':
Don't crash Launcher on config change.
2011-01-14 18:51:33 -08:00
bcdc73f5a7
Merge "Don't crash Launcher on config change." into honeycomb
2011-01-14 18:49:55 -08:00
0202684094
am b73203ab: Merge "Make sure service handles are live before passing to other objects." into gingerbread
...
* commit 'b73203ab7e308b747819de2b2400afe971ef3bff':
Make sure service handles are live before passing to other objects.
2011-01-14 18:38:46 -08:00
dbe61dfa77
merge 83fdc69e from gingerbread - do not merge
...
Change-Id: Ib1e9e12244a44f75a93d66142e71915de6386680
2011-01-14 18:33:51 -08:00
6b48213a87
am 1362c94b: Merge "Fix bug 3337711 - Volume panel layout adjustments" into honeycomb
...
* commit '1362c94bf84b51d2363e4a030fb847478759da2f':
Fix bug 3337711 - Volume panel layout adjustments
2011-01-14 18:27:58 -08:00
f4f4f36969
Merge "Fix bug 3337711 - Volume panel layout adjustments" into honeycomb
2011-01-14 18:26:01 -08:00
76cd4ddc6a
partially fix [3306150] HTML5 video with H/W acceleration blackout
...
We used to guarantee that a layer in SurfaceFlinger would never be
destroyed before all references (to its ISurface) on the client
side would be released. At some point, this guarantee got
relaxed to allow to free gralloc resources sooner. This last
change was incorrect, because:
- in implementations with reference-counting the gralloc resources
wouldn't be released anyways, until all the mapping were gone
- in implementations without ref counting, the client side
would most likely crash or do something bad
- it also caused the SharedBufferStack slot to be reallocated
to another surface, which could be problematic if the client
continued to use the surface after the window manager destroyed it.
So, we essentially reinstate the guarantee that layers won't be
destroyed until after all references to their ISurface are
released.
NOTE: This doesn't entirely fix 3306150 because there is another
problem there where the Browser continues to use a surface after it
has been destroyed.
Change-Id: I305c830dd722b30a6d53cbf3a9c714fd3cf7eb06
2011-01-14 18:19:02 -08:00
d41381d8c5
Merge "Make sure service handles are live before passing to other objects." into gingerbread
2011-01-14 18:18:25 -08:00
5243d74463
am 77c3e4b9: Merge "Make getFallbackAction return false when there is none." into honeycomb
...
* commit '77c3e4b9fdab1f48cfa95cddb4a110946f4a1cd8':
Make getFallbackAction return false when there is none.
2011-01-14 18:01:27 -08:00
d2690932bd
Merge "Make getFallbackAction return false when there is none." into honeycomb
2011-01-14 17:59:56 -08:00
9346643577
Make getFallbackAction return false when there is none.
...
Change-Id: Id17c0f7269e4a228f4e5f11c54614fec508222a2
2011-01-14 17:54:38 -08:00
a08d9acdf5
am 06bc9721: Merge "Disable soft keyboard when keyboard attached." into honeycomb
...
* commit '06bc9721d8f5db053b51e1c536e746833ad46036':
Disable soft keyboard when keyboard attached.
2011-01-14 17:50:12 -08:00
e45ee8cf48
Merge "Disable soft keyboard when keyboard attached." into honeycomb
2011-01-14 17:48:09 -08:00
32f42bef47
am 1061b966: Merge "Fix bug with mice that send multiple BTN_MOUSE values." into honeycomb
...
* commit '1061b96635d69ec6c29e43633fcf57262728af15':
Fix bug with mice that send multiple BTN_MOUSE values.
2011-01-14 17:45:01 -08:00
f7bd7c5dc5
Merge "Fix bug with mice that send multiple BTN_MOUSE values." into honeycomb
2011-01-14 17:43:12 -08:00
c06ff0e234
am 72fcd0a4: Merge "LayoutLib: update logs to use new data bundle" into honeycomb
...
* commit '72fcd0a4a9afc5ddc036ed57e9da4481956bcbfc':
LayoutLib: update logs to use new data bundle
2011-01-14 17:31:36 -08:00
057bba1586
Merge "LayoutLib: update logs to use new data bundle" into honeycomb
2011-01-14 17:30:22 -08:00
d86fae8e63
am 8dd5b1e5: Prevent NPE when a View is detached without having been attached. Bug #3355252
...
* commit '8dd5b1e53184ed3b786dd329e12d665ae59ca3f4':
Prevent NPE when a View is detached without having been attached. Bug #3355252
2011-01-14 17:28:28 -08:00
7d4d9f74b8
am c8276990: Merge "Add volume down as a safe mode key for Stingray." into honeycomb
...
* commit 'c8276990df3ac55c8cbda12919abe247132c96ea':
Add volume down as a safe mode key for Stingray.
2011-01-14 17:24:30 -08:00
6e3544e676
Merge "Add volume down as a safe mode key for Stingray." into honeycomb
2011-01-14 17:22:53 -08:00
4f012af11d
am 69d66e00: Fixing StackView rotation bugs
...
* commit '69d66e00136f67332c992326a7b2eb334eeb32a2':
Fixing StackView rotation bugs
2011-01-14 17:05:14 -08:00
Adam Powell