Santosh Madhava
a9643f6350
Merge "Fix for issue 3495914: (In Java) Video clip switches between start and end"
2011-03-02 09:48:39 -08:00
Daniel Sandler
63a4122477
Merge "Bring back some status bar animations."
2011-03-02 09:27:56 -08:00
Kenny Root
e2db5bf537
Merge "Switch to returnCode for IPackageDeleteObserver"
2011-03-02 08:50:42 -08:00
Daniel Sandler
d7ff3083a6
Merge "Turn off animations in the status bar."
2011-03-02 08:38:20 -08:00
Leon Scroggins
2bcea0c685
Merge "New assets for checkboxes and radios for WebView."
2011-03-02 08:34:25 -08:00
Kristian Monsen
156425f084
Merge "Fix from post submit review"
2011-03-02 03:27:47 -08:00
Mathias Agopian
17290c5583
Merge "Add support for up to 32 buffers per Surface"
2011-03-01 20:08:07 -08:00
Vasu Nori
7af7376bea
Merge "cosmetic fixes: removing unused members/imports"
2011-03-01 18:39:14 -08:00
Dianne Hackborn
f5f2862b1b
Merge "Fix issue #3387676 com.android.browser: java.lang.NullPointerException..."
2011-03-01 18:34:01 -08:00
Vasu Nori
f84fd3db8d
Merge "bug:3497143 don't print warning if it is a bug in platform - not in app."
2011-03-01 18:26:17 -08:00
Jim Miller
a7b328c6b4
Merge "Fix 3463772: Bring back alarm icon on LockScreen"
2011-03-01 18:17:06 -08:00
Jason Chen
f4bc6b0649
am d616d505: Merge "Bugfixes in StaticLayout. DO NOT MERGE." into honeycomb
...
* commit 'd616d5054f5e93f6a492896e7d8dd6d5b7eaa84b':
Bugfixes in StaticLayout. DO NOT MERGE.
2011-03-01 17:57:56 -08:00
Jason Chen
5c2aaabb9a
Merge "Bugfixes in StaticLayout. DO NOT MERGE." into honeycomb
2011-03-01 17:56:06 -08:00
Jason Chen
aa11f79c80
am ef7aed89: Merge "DO NOT MERGE Cherry-pick of cd59febcea2 from master" into honeycomb
...
* commit 'ef7aed89b610d0bd63ad7a1422b8db85730cb917':
DO NOT MERGE Cherry-pick of cd59febcea2 from master
2011-03-01 17:54:26 -08:00
Jason Chen
9f28fffe97
Merge "DO NOT MERGE Cherry-pick of cd59febcea2 from master" into honeycomb
2011-03-01 17:50:51 -08:00
Jim Miller
79daa8e888
Merge "Fix 3482763: Minor layout tweaks and new asset for recents"
2011-03-01 17:50:41 -08:00
Daniel Sandler
e0e1a27b50
Merge "Make with the clicky. (Status bar buttons now play FX.)"
2011-03-01 17:49:18 -08:00
Dianne Hackborn
5faf683e2b
Merge "Fix issue #3405957 com.android.settings: java.lang.NullPointerException..."
2011-03-01 17:36:25 -08:00
Dianne Hackborn
1acdeb0c97
Merge "Fix issue #3411615 : Crash when getting dialog layout inflator."
2011-03-01 17:18:10 -08:00
James Dong
70a67a1621
Merge "Get rid of redundant media profiles"
2011-03-01 17:11:26 -08:00
Eric Laurent
8200789b7a
Merge "Fix issue 3499926."
2011-03-01 17:08:02 -08:00
Jim Miller
af9bd17969
Merge "Fix 3500730: Prevent NPE cause by clicking on footer view"
2011-03-01 16:27:40 -08:00
Romain Guy
8bd4bed0ad
Merge "Don't account for scrollX/Y when drawing a display list in a layer."
2011-03-01 15:54:57 -08:00
Amith Yamasani
532274b190
am df33b8c5: Merge "Check for NTP time as soon as WIFI is connected." into honeycomb
...
* commit 'df33b8c51d431a7c0f7a89ead8dfacdd3660ff48':
Check for NTP time as soon as WIFI is connected.
2011-03-01 15:50:41 -08:00
Amith Yamasani
03e3b90862
Merge "Check for NTP time as soon as WIFI is connected." into honeycomb
2011-03-01 15:47:57 -08:00
Adam Powell
ce717cd939
Merge "Fix bug 3501411 - ListView should ignore "up" events outside of its view"
2011-03-01 15:41:58 -08:00
Adam Cohen
355dfa76f9
Merge "Adding mouse scroll wheel support to StackView"
2011-03-01 15:27:19 -08:00
Dianne Hackborn
b2a10fcb0f
Merge "Fix issue #3495749 : Crash on choosing to open the downloaded images"
2011-03-01 15:26:44 -08:00
John Reck
3be5902930
Merge "Send correct cookies for HTML5 video when incognito"
2011-03-01 15:07:39 -08:00
Romain Guy
c0dd743863
Merge "Correctly mark layers dirty when drawing WebView."
2011-03-01 14:53:48 -08:00
Eric Fischer
6c0a5000f6
am 86b7a597: Import revised translations. DO NOT MERGE
...
* commit '86b7a59726010e0952b0ede4fd40d933aeb83384':
Import revised translations. DO NOT MERGE
2011-03-01 14:41:39 -08:00
Jamie Gennis
ea72db3737
Merge "Add the MIN_UNDEQUEUED_BUFFERS query to ANW."
2011-03-01 14:38:20 -08:00
Dianne Hackborn
4a89a5e13e
Merge "Fix Issue 14340: Sticky Service killed with onDestroy not called, not restarted."
2011-03-01 14:36:12 -08:00
Romain Guy
976c89c19f
Merge "Avoid UTF-8 conversions and string copies whenever possible."
2011-03-01 14:28:13 -08:00
Mathias Agopian
acd116daea
Add support for up to 32 buffers per Surface
...
Bug: 3488016
Change-Id: Ie5536ad77d42a4d0e8270e0fd87ecb73471bcbbc
2011-03-01 14:09:06 -08:00
Gilles Debunne
173f177ea8
Merge "AbsListView notifies scroll events to the ViewTreeObserver."
2011-03-01 13:55:16 -08:00
Costin Manolache
fbbb4a338e
am 66d46ac6: (-s ours) am db52ab69: Merge "DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions." into gingerbread
...
* commit '66d46ac61478c967ed45bd1c27b0436654d54299':
DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions.
2011-03-01 13:28:03 -08:00
Kristian Monsen
d29000cc0b
Merge "Part of fix for bug 3489551 Browser doesn't send cookies for HTML5 video in incognito"
2011-03-01 13:12:24 -08:00
Derek Sollenberger
5bee142a7a
Merge "Don't update webkit at every stage of a zoom animation."
2011-03-01 12:58:31 -08:00
Fred Quintana
27ecc3bffb
Merge "Fix a deadlock in AccountManagerService cause by different paths of code getting the mCacheLock and DB locks in different orders."
2011-03-01 12:30:06 -08:00
Costin Manolache
a880e1e731
am db52ab69: Merge "DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions." into gingerbread
...
* commit 'db52ab69f22e24615eaa2e8f9845e157426d3dd6':
DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions.
2011-03-01 12:29:40 -08:00
Costin Manolache
a9869cf37b
Merge "DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions." into gingerbread
2011-03-01 12:25:21 -08:00
Santosh Madhava
b3382cc23e
Merge "Fix for issue 3431967: Memory leak from video editor engine"
2011-03-01 12:04:12 -08:00
Mike Lockwood
86d2fee005
Merge "UsbDeviceSettingsManager: don't write settings file when not necessary"
2011-03-01 12:00:09 -08:00
Mike Lockwood
416a44a9bd
Merge "Fix UsbDeviceSettingsManager locking."
2011-03-01 11:59:32 -08:00
Mike Lockwood
4e5f5427e2
Merge "Move USB framework support from android.hardware to android.hardware.usb package"
2011-03-01 11:58:22 -08:00
Eric Laurent
09fce23a7e
Merge "Fix issue 3479042."
2011-03-01 11:46:15 -08:00
Jamie Gennis
30365befce
Merge "Stagefright: Query buffer usage from the component."
2011-03-01 11:41:29 -08:00
Irfan Sheriff
82a1291b20
Merge "Using AsyncChannel for wifi connectivity"
2011-03-01 11:32:24 -08:00
Dianne Hackborn
20cad7c563
am 7fff2d19: am 1de4a2ca: am 62619392: Merge "Fix leak when keylock is recreated."
...
* commit '7fff2d19a24f9f9b669676864dc5652ab179d2fc':
Fix leak when keylock is recreated.
2011-03-01 11:13:14 -08:00