Scott Main
b2b66943ba
am 6f92dbc4: Merge "fix sdk build breakage; remove invalid @note tag" into honeycomb
...
* commit '6f92dbc49f8ed797bc56e5b84bb897736322ab2d':
fix sdk build breakage; remove invalid @note tag
2011-01-14 15:45:11 -08:00
Adam Powell
4373843f90
am 8e4d3ba6: Merge "Fix bug 3339039 - Preserve proper behavior for action button text when updated." into honeycomb
...
* commit '8e4d3ba67824d87d832d90e1d0555456b3e76aca':
Fix bug 3339039 - Preserve proper behavior for action button text when updated.
2011-01-14 15:43:03 -08:00
Scott Main
609fffabc7
Merge "fix sdk build breakage; remove invalid @note tag" into honeycomb
2011-01-14 15:42:35 -08:00
Dianne Hackborn
9faa02adf4
am 0b08c5cb: Merge "Don\'t drop the drawable cache completely on configuration change" into honeycomb
...
* commit '0b08c5cb14e848f41eb33093c3e8198ab416e0ab':
Don't drop the drawable cache completely on configuration change
2011-01-14 15:41:00 -08:00
Adam Powell
bc81dd8529
Merge "Fix bug 3339039 - Preserve proper behavior for action button text when updated." into honeycomb
2011-01-14 15:40:07 -08:00
satok
e9d2e7443c
am 604363dc: Merge "switchToLastInputMethod returns a implicitly enabled subtype in the history" into honeycomb
...
* commit '604363dc63206a07280b2fb5b89f2b32c2cc8ae7':
switchToLastInputMethod returns a implicitly enabled subtype in the history
2011-01-14 15:38:55 -08:00
Romain Guy
799b3fdbbb
am 77773197: Merge "Don\'t delete objects twice..." into honeycomb
...
* commit '7777319712c73e1de7c2e1fe21eea87ddd5594f0':
Don't delete objects twice...
2011-01-14 15:38:51 -08:00
Dianne Hackborn
e66414f7df
Merge "Don't drop the drawable cache completely on configuration change" into honeycomb
2011-01-14 15:37:28 -08:00
satok
0b9a81ac66
Merge "switchToLastInputMethod returns a implicitly enabled subtype in the history" into honeycomb
2011-01-14 15:35:53 -08:00
Romain Guy
43b7c9aec8
Merge "Don't delete objects twice..." into honeycomb
2011-01-14 15:35:34 -08:00
Romain Guy
e137df2b5c
am 4b26d057: Merge "Copy shaders when recording them in display lists." into honeycomb
...
* commit '4b26d057665c662c782e3baa5d9ca8287c96ede4':
Copy shaders when recording them in display lists.
2011-01-14 15:31:50 -08:00
Romain Guy
ffb17a716e
Merge "Copy shaders when recording them in display lists." into honeycomb
2011-01-14 15:29:36 -08:00
Xavier Ducrohet
2e57a2a76d
am 20220dfa: Merge "LayoutLib: Misc fixes." into honeycomb
...
* commit '20220dfa428f97e2def04e339ddfbb3a0531d456':
LayoutLib: Misc fixes.
2011-01-14 15:28:43 -08:00
Xavier Ducrohet
55c6d4c4c2
Merge "LayoutLib: Misc fixes." into honeycomb
2011-01-14 15:26:30 -08:00
Patrick Dubroy
105c16d8da
am bdcff0fa: Merge "Allow old view hierarchy to be GC\'ed more quickly during rotation." into honeycomb
...
* commit 'bdcff0fa8383a1ae93c18a768a7c2bf150d3f405':
Allow old view hierarchy to be GC'ed more quickly during rotation.
2011-01-14 14:47:23 -08:00
Patrick Dubroy
6ab916c270
Merge "Allow old view hierarchy to be GC'ed more quickly during rotation." into honeycomb
2011-01-14 14:44:20 -08:00
Alex Sakhartchouk
ca404f7faf
am bfa62339: Merge "Removing things that shouldn\'t be public" into honeycomb
...
* commit 'bfa62339ef97c6be6ac904532a115712d669025b':
Removing things that shouldn't be public
2011-01-14 14:21:29 -08:00
Alex Sakhartchouk
1b093dd19c
Merge "Removing things that shouldn't be public" into honeycomb
2011-01-14 14:19:45 -08:00
Scott Main
237f202fe8
am 2150553d: cherrypick Change-Id: I1365c6c45f8e1f75ee4afbc52c32778d21b97be4 from master docs: Rewrite of App Fundamentals.. Part 2. This introduces three new docs:
...
* commit '2150553dc374204a1cb3033ed3fa65c2f22dd5e7':
cherrypick Change-Id: I1365c6c45f8e1f75ee4afbc52c32778d21b97be4 from master docs: Rewrite of App Fundamentals.. Part 2. This introduces three new docs:
2011-01-14 14:10:14 -08:00
Eric Fischer
7eae809fc6
am 4c3b788e: Merge "Update large screen translations." into honeycomb
...
* commit '4c3b788ec408cfc5683fbe8d2976dd3fc2b13609':
Update large screen translations.
2011-01-14 14:04:01 -08:00
Eric Fischer
f6afa325e0
Merge "Update large screen translations." into honeycomb
2011-01-14 14:01:03 -08:00
Adam Powell
710eda1a15
am 94613752: Merge "Rework action bar menus." into honeycomb
...
* commit '946137520d67d3c18ceaba058e622f24b7fbf04d':
Rework action bar menus.
2011-01-14 13:57:56 -08:00
Adam Powell
0735e419a0
Merge "Rework action bar menus." into honeycomb
2011-01-14 13:56:29 -08:00
Marco Nelissen
1e68511cb3
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
f269c23919
Merge "Fix issue with notification layouts." into honeycomb
2011-01-14 13:17:56 -08:00
Kenny Root
afb7c63cf5
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
d37b574931
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
26539dba41
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
f221b2afd3
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
bfcf601262
Merge "Use holo style mouse pointer." into honeycomb
2011-01-14 13:03:54 -08:00
Huahui Wu
0a9b75cd97
Merge "b/3348192 re-enable snap scrolling mode." into honeycomb
2011-01-14 13:03:23 -08:00
Kenny Root
9a6ed2747f
am bd392c53: Check for null in PackageSetting constructor
...
* commit 'bd392c53970f4c24908668a6b28248943b31b072':
Check for null in PackageSetting constructor
2011-01-14 13:03:02 -08:00
Brad Fitzpatrick
12494fcf4b
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
92165cd763
Merge "Watchdog can get deadlocked on activity manager" into honeycomb
2011-01-14 12:48:08 -08:00
Kenny Root
a1433270c2
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
32c652c6bc
Merge "Add the {get,set}PackageObbPaths calls to API" into honeycomb
2011-01-14 12:42:12 -08:00
Christopher Tate
95c6f90abf
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
76630daaa1
Merge "Send DRAG_STARTED notices to views that become visible during drag" into honeycomb
2011-01-14 12:36:53 -08:00
Dianne Hackborn
1a57a9f4b1
am d922ae01: Add Holo theme for IMEs.
...
* commit 'd922ae01ca99a2b6d39a9393f86776a1d10ebd14':
Add Holo theme for IMEs.
2011-01-14 12:31:59 -08:00
Robert Greenwalt
20a2b025c6
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
22b075c949
Merge "Update network subtypes info so it is current." into honeycomb
2011-01-14 12:23:45 -08:00
Adam Powell
e2e63d7b93
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
38a5410f16
Merge "Fix bug 3347747 - Use a better context when fetching resources for action modes" into honeycomb
2011-01-14 12:12:13 -08:00
satok
162cd17358
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
2903930bcf
Merge "Add input methods settings panel" into honeycomb
2011-01-14 12:03:40 -08:00
Costin Manolache
307b811ee7
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
aad69cf08a
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
Romain Guy
d9ee65e634
Merge "Don't add clipped rects to layer regions. Bug #3350208 " into honeycomb
2011-01-14 11:25:56 -08:00
Mathias Agopian
f637bd067e
am 010719c2: Merge "fix [3312683] Camera mirroring problem after switching from back to front camera" into honeycomb
...
* commit '010719c2fff4ab40757984f29d7755ff7f79e3de':
fix [3312683] Camera mirroring problem after switching from back to front camera
2011-01-14 11:05:24 -08:00
Eric Fischer
66a9c0a652
am fae55508: (-s ours) am 5a40b8ef: Merge "Add date format and map center resources for new locales." into gingerbread
...
* commit 'fae55508d04344a97830bbf38ca02214642f7b7e':
Add date format and map center resources for new locales.
2011-01-14 11:02:25 -08:00