Marco Nelissen
7243729c64
am ae0c56c7: am 3506d885: Merge "Fix issue with notification layouts." into honeycomb
...
* commit 'ae0c56c7367130db02594501238b51d61841de61':
Fix issue with notification layouts.
2011-01-14 13:22:27 -08:00
Marco Nelissen
ae0c56c736
am 3506d885: Merge "Fix issue with notification layouts." into honeycomb
...
* commit '3506d885b850a3d3e2c218f427ccc5dae6d205d7':
Fix issue with notification layouts.
2011-01-14 13:20:13 -08:00
Marco Nelissen
3506d885b8
Merge "Fix issue with notification layouts." into honeycomb
2011-01-14 13:17:56 -08:00
Kenny Root
3733969810
am c956472a: (-s ours) am b220d62b: (-s ours) am ea6bf362: Deep clone settings for system package update DO NOT MERGE
...
* commit 'c956472aa63a28269f68aedcdba22d640910a6af':
Deep clone settings for system package update DO NOT MERGE
2011-01-14 13:13:06 -08:00
Jeff Brown
53183aeb35
am 9781071a: am e76820bf: Merge "Use holo style mouse pointer." into honeycomb
...
* commit '9781071ae704c9370901e248f1f5bc79fcefc3c7':
Use holo style mouse pointer.
2011-01-14 13:13:03 -08:00
Huahui Wu
313fc036ed
am ee2d8cd5: am cbe397f2: Merge "b/3348192 re-enable snap scrolling mode." into honeycomb
...
* commit 'ee2d8cd5bc50589229b469b80b2724836d83e6eb':
b/3348192 re-enable snap scrolling mode.
2011-01-14 13:12:59 -08:00
Kenny Root
8470165e6e
am 014ef618: am bd392c53: Check for null in PackageSetting constructor
...
* commit '014ef61842dd877b60cb16d433ecff9165944fd8':
Check for null in PackageSetting constructor
2011-01-14 13:12:54 -08:00
Kenny Root
c956472aa6
am b220d62b: (-s ours) am ea6bf362: Deep clone settings for system package update DO NOT MERGE
...
* commit 'b220d62bf3032c5c8b2a36a00cd6e6d6b63c7db5':
Deep clone settings for system package update DO NOT MERGE
2011-01-14 13:07:56 -08:00
Kenny Root
b220d62bf3
am ea6bf362: Deep clone settings for system package update DO NOT MERGE
...
* commit 'ea6bf3628140283df24f2652b686d083b0d31ed9':
Deep clone settings for system package update DO NOT MERGE
2011-01-14 13:05:53 -08:00
Jeff Brown
9781071ae7
am e76820bf: Merge "Use holo style mouse pointer." into honeycomb
...
* commit 'e76820bf413364898493f86ca6027b28d3caed2b':
Use holo style mouse pointer.
2011-01-14 13:05:11 -08:00
Huahui Wu
ee2d8cd5bc
am cbe397f2: Merge "b/3348192 re-enable snap scrolling mode." into honeycomb
...
* commit 'cbe397f243c4f1706cf7bbd9fcd07c1c13ccb097':
b/3348192 re-enable snap scrolling mode.
2011-01-14 13:05:04 -08:00
Jeff Brown
e76820bf41
Merge "Use holo style mouse pointer." into honeycomb
2011-01-14 13:03:54 -08:00
Huahui Wu
cbe397f243
Merge "b/3348192 re-enable snap scrolling mode." into honeycomb
2011-01-14 13:03:23 -08:00
Kenny Root
014ef61842
am bd392c53: Check for null in PackageSetting constructor
...
* commit 'bd392c53970f4c24908668a6b28248943b31b072':
Check for null in PackageSetting constructor
2011-01-14 13:03:02 -08:00
Jeff Brown
909733cdeb
Use holo style mouse pointer.
...
Change-Id: I17df431075c8ffec3ade151c6c85ec34ad8397dd
2011-01-14 13:02:40 -08:00
Kenny Root
bd392c5397
Check for null in PackageSetting constructor
...
Should bring honeycomb into parity with gingerbread changes.
Change-Id: Ieb48a0e420d4c2981130f268aba9b24f4fe25b84
2011-01-14 12:58:12 -08:00
Brad Fitzpatrick
39f35f0a62
am 9dde087d: am 1e8d23f6: Merge "Watchdog can get deadlocked on activity manager" into honeycomb
...
* commit '9dde087dcb94341bd2b66e186534dc44e660a2ce':
Watchdog can get deadlocked on activity manager
2011-01-14 12:51:57 -08:00
Huahui Wu
c010924da9
b/3348192 re-enable snap scrolling mode.
...
Change-Id: I19c9a2afdf28367f623bd9bd6b25e822a06a215c
2011-01-14 12:51:12 -08:00
Brad Fitzpatrick
9dde087dcb
am 1e8d23f6: Merge "Watchdog can get deadlocked on activity manager" into honeycomb
...
* commit '1e8d23f6b03aeed45cdcf5c03121741ee9684396':
Watchdog can get deadlocked on activity manager
2011-01-14 12:50:00 -08:00
Brad Fitzpatrick
1e8d23f6b0
Merge "Watchdog can get deadlocked on activity manager" into honeycomb
2011-01-14 12:48:08 -08:00
Kenny Root
27b775a62d
am d9fa11b4: am 312206b9: Merge "Add the {get,set}PackageObbPaths calls to API" into honeycomb
...
* commit 'd9fa11b446da5dbc92776518c20bab1f04e55537':
Add the {get,set}PackageObbPaths calls to API
2011-01-14 12:46:34 -08:00
Kenny Root
d9fa11b446
am 312206b9: Merge "Add the {get,set}PackageObbPaths calls to API" into honeycomb
...
* commit '312206b98749bbe395416634e6e82bd242b1d5f2':
Add the {get,set}PackageObbPaths calls to API
2011-01-14 12:44:39 -08:00
Kenny Root
312206b987
Merge "Add the {get,set}PackageObbPaths calls to API" into honeycomb
2011-01-14 12:42:12 -08:00
Christopher Tate
74230aa1b2
am e1cc00bb: am 64cb24e6: Merge "Send DRAG_STARTED notices to views that become visible during drag" into honeycomb
...
* commit 'e1cc00bba019bdc165d61b14fef8a72fdeed1ae5':
Send DRAG_STARTED notices to views that become visible during drag
2011-01-14 12:40:41 -08:00
Christopher Tate
e1cc00bba0
am 64cb24e6: Merge "Send DRAG_STARTED notices to views that become visible during drag" into honeycomb
...
* commit '64cb24e686b13aabe3d28e049796c8315b011485':
Send DRAG_STARTED notices to views that become visible during drag
2011-01-14 12:38:24 -08:00
Christopher Tate
64cb24e686
Merge "Send DRAG_STARTED notices to views that become visible during drag" into honeycomb
2011-01-14 12:36:53 -08:00
Dianne Hackborn
0142e990ff
am f21ae269: am d922ae01: Add Holo theme for IMEs.
...
* commit 'f21ae26935349f45c55afa5c8e45e1f6aa880915':
Add Holo theme for IMEs.
2011-01-14 12:35:06 -08:00
Dianne Hackborn
f21ae26935
am d922ae01: Add Holo theme for IMEs.
...
* commit 'd922ae01ca99a2b6d39a9393f86776a1d10ebd14':
Add Holo theme for IMEs.
2011-01-14 12:31:59 -08:00
Marco Nelissen
d80764e7a4
Fix issue with notification layouts.
...
b/3353796
Change-Id: I9a3354ed9e48ba1c057cacc7c9b9574664e683c5
2011-01-14 12:31:40 -08:00
Robert Greenwalt
e5a3556268
am 7b04b1d7: am 1e02ebd2: Merge "Update network subtypes info so it is current." into honeycomb
...
* commit '7b04b1d7ff7a38be30794c25e893beb40616affb':
Update network subtypes info so it is current.
2011-01-14 12:28:58 -08:00
Dianne Hackborn
d922ae01ca
Add Holo theme for IMEs.
...
Also clean up theme selection code to get rid of duplication.
Change-Id: Idf7b21db70ee83fce24756ead877169bd08b77a9
2011-01-14 12:28:23 -08:00
Robert Greenwalt
7b04b1d7ff
am 1e02ebd2: Merge "Update network subtypes info so it is current." into honeycomb
...
* commit '1e02ebd225cfe629a4ab2b98f19e4e08ad97c397':
Update network subtypes info so it is current.
2011-01-14 12:26:39 -08:00
Robert Greenwalt
1e02ebd225
Merge "Update network subtypes info so it is current." into honeycomb
2011-01-14 12:23:45 -08:00
Kenny Root
5d40fe9c68
Add the {get,set}PackageObbPaths calls to API
...
Add getPackageObbPaths() and setPackageObbPaths() to the public API.
Bug: 3214719
Change-Id: I8627b5f674a795d5780eb5c08911419110670a41
2011-01-14 12:18:48 -08:00
Adam Powell
856b2549e3
am 25cb8bcd: am 2dc59d56: Merge "Fix bug 3347747 - Use a better context when fetching resources for action modes" into honeycomb
...
* commit '25cb8bcd19231dff29b9ec80ba94d263068465bb':
Fix bug 3347747 - Use a better context when fetching resources for action modes
2011-01-14 12:16:45 -08:00
Adam Powell
25cb8bcd19
am 2dc59d56: Merge "Fix bug 3347747 - Use a better context when fetching resources for action modes" into honeycomb
...
* commit '2dc59d56cbfe90fdae745496038352fdada6ee26':
Fix bug 3347747 - Use a better context when fetching resources for action modes
2011-01-14 12:14:24 -08:00
Adam Powell
2dc59d56cb
Merge "Fix bug 3347747 - Use a better context when fetching resources for action modes" into honeycomb
2011-01-14 12:12:13 -08:00
Adam Powell
48e8ac311b
Fix bug 3347747 - Use a better context when fetching resources for
...
action modes
Change-Id: I0c6595c290a9d41f673944c127d2e9aaf7dc84ce
2011-01-14 12:10:47 -08:00
satok
637ccd49ed
am b3b1509d: am 64fc11c3: Merge "Add input methods settings panel" into honeycomb
...
* commit 'b3b1509de73e61296d4fae5ee7e065915ffd4109':
Add input methods settings panel
2011-01-14 12:07:24 -08:00
satok
b3b1509de7
am 64fc11c3: Merge "Add input methods settings panel" into honeycomb
...
* commit '64fc11c3ddefc4272a171aaab5c1291709fabe7e':
Add input methods settings panel
2011-01-14 12:05:09 -08:00
satok
64fc11c3dd
Merge "Add input methods settings panel" into honeycomb
2011-01-14 12:03:40 -08:00
satok
82beadfa06
Add input methods settings panel
...
Bug: 3141466
Bug: 3301559
Bug: 3284424
Moved from old master I4d9abeea
Change-Id: I62fa64cc095e1b9ac34f21e7d4d2e0bb8a3e68fc
2011-01-15 05:00:51 +09:00
Brad Fitzpatrick
9765c72eea
Watchdog can get deadlocked on activity manager
...
Bug: 3351719
Change-Id: Ie5bb39e5ff92f41c14ae59240173fab9c2491a91
2011-01-14 11:47:01 -08:00
Christopher Tate
86cab1bd52
Send DRAG_STARTED notices to views that become visible during drag
...
We now recognize that a view is now a candidate for receiving the drop
but hasn't yet been notified about it, and send the DRAG_STARTED lifecycle
event properly. This change also changes the DRAG_ENDED policy: now,
every view that had been sent a DRAG_STARTED receives the corresponding
DRAG_ENDED event, even though subsequent visibility changes may have
occured.
Change-Id: If4ae9ddbf414703e9f15eb2005471626bf19f316
2011-01-14 11:46:09 -08:00
Costin Manolache
81f2b9ef4a
am 660f72a0: am c6684f9e: Fix previous quick fix, LoginOptions is final.
...
* commit '660f72a01681833b0e1e2c23b6281946d01bfb8a':
Fix previous quick fix, LoginOptions is final.
2011-01-14 11:32:25 -08:00
Romain Guy
a8ad9088a4
am 527d6c03: am fe5be1b0: Merge "Don\'t add clipped rects to layer regions. Bug #3350208 " into honeycomb
...
* commit '527d6c03ab094ed956190eac26f5cd0e79b7d914':
Don't add clipped rects to layer regions. Bug #3350208
2011-01-14 11:30:12 -08:00
Costin Manolache
660f72a016
am c6684f9e: Fix previous quick fix, LoginOptions is final.
...
* commit 'c6684f9e9790e92960504e9b32f20f27003d9f37':
Fix previous quick fix, LoginOptions is final.
2011-01-14 11:29:59 -08:00
Romain Guy
527d6c03ab
am fe5be1b0: Merge "Don\'t add clipped rects to layer regions. Bug #3350208 " into honeycomb
...
* commit 'fe5be1b04273b8f67a00ac688940299f7d502c1d':
Don't add clipped rects to layer regions. Bug #3350208
2011-01-14 11:27:57 -08:00
Costin Manolache
c6684f9e97
Fix previous quick fix, LoginOptions is final.
...
Change-Id: I5f262458239378697a67cbd8e83175bf3ffc7f5b
2011-01-14 11:26:25 -08:00
Romain Guy
fe5be1b042
Merge "Don't add clipped rects to layer regions. Bug #3350208 " into honeycomb
2011-01-14 11:25:56 -08:00