Dianne Hackborn
c389194456
am a3477330: (-s ours) am 88471b25: Merge "DO NOT MERGE Added check to make orientation calculations more robust" into honeycomb
...
* commit 'a34773300009e41d965a7b9232f488ab7295e538':
DO NOT MERGE Added check to make orientation calculations more robust
2011-01-14 16:07:18 -08:00
Dianne Hackborn
8270cfa522
am 88471b25: Merge "DO NOT MERGE Added check to make orientation calculations more robust" into honeycomb
...
* commit '88471b25632818a8bc79193e20bd04a8be39f660':
DO NOT MERGE Added check to make orientation calculations more robust
2011-01-14 16:03:30 -08:00
Dianne Hackborn
2b89bd17e4
Merge "DO NOT MERGE Added check to make orientation calculations more robust" into honeycomb
2011-01-14 16:02:07 -08:00
Scott Main
2a56c185a7
am 2ef7081b: am 6f92dbc4: Merge "fix sdk build breakage; remove invalid @note tag" into honeycomb
...
* commit '2ef7081bc744aad8d94a16d08452f455731f241a':
fix sdk build breakage; remove invalid @note tag
2011-01-14 15:47:41 -08:00
Adam Powell
8297b206e5
am 7bd540ac: am 8e4d3ba6: Merge "Fix bug 3339039 - Preserve proper behavior for action button text when updated." into honeycomb
...
* commit '7bd540ac8e630d94fc67fe4d1e048afd0eb33864':
Fix bug 3339039 - Preserve proper behavior for action button text when updated.
2011-01-14 15:45:37 -08:00
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
Dianne Hackborn
32631f4b2d
am 909d447d: am 0b08c5cb: Merge "Don\'t drop the drawable cache completely on configuration change" into honeycomb
...
* commit '909d447d8ab565019f05c2003bc4f9d1037b1b17':
Don't drop the drawable cache completely on configuration change
2011-01-14 15:43:35 -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
satok
3ca1d59415
am fb77a336: am 604363dc: Merge "switchToLastInputMethod returns a implicitly enabled subtype in the history" into honeycomb
...
* commit 'fb77a336af46ceb5a718c5ee7fc34da4b4a06f2a':
switchToLastInputMethod returns a implicitly enabled subtype in the history
2011-01-14 15:40:26 -08:00
Romain Guy
29c4c0c0c7
am 2ee32348: am 77773197: Merge "Don\'t delete objects twice..." into honeycomb
...
* commit '2ee3234885072a41a9bf6d15e989dc7bc218a18f':
Don't delete objects twice...
2011-01-14 15:40:23 -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
912bc12f44
am 53179fe3: am 4b26d057: Merge "Copy shaders when recording them in display lists." into honeycomb
...
* commit '53179fe3949d480d89aa23533310e0bdf1bca4ba':
Copy shaders when recording them in display lists.
2011-01-14 15:34:15 -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
Xavier Ducrohet
2ee77e42d5
am e94b4822: am 20220dfa: Merge "LayoutLib: Misc fixes." into honeycomb
...
* commit 'e94b482253679004b7942d26c6cbc5d814921de2':
LayoutLib: Misc fixes.
2011-01-14 15:31:04 -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
280ef371c7
am 75f555f2: am bdcff0fa: Merge "Allow old view hierarchy to be GC\'ed more quickly during rotation." into honeycomb
...
* commit '75f555f26ffe1471ce0b9c7f83c4c81cff9ff145':
Allow old view hierarchy to be GC'ed more quickly during rotation.
2011-01-14 14:49:07 -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
9aae959f8b
am 169b9c1e: am bfa62339: Merge "Removing things that shouldn\'t be public" into honeycomb
...
* commit '169b9c1e31f04d4b45e164920d1cd414425be2e7':
Removing things that shouldn't be public
2011-01-14 14:23:59 -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
5ec92002be
am 9fc8bea9: am 2150553d: cherrypick Change-Id: I1365c6c45f8e1f75ee4afbc52c32778d21b97be4 from master docs: Rewrite of App Fundamentals.. Part 2. This introduces three new docs:
...
* commit '9fc8bea989452e092aa2892d92df462aa9c704c9':
cherrypick Change-Id: I1365c6c45f8e1f75ee4afbc52c32778d21b97be4 from master docs: Rewrite of App Fundamentals.. Part 2. This introduces three new docs:
2011-01-14 14:12:36 -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
0244aa5653
am 14541aa9: am 4c3b788e: Merge "Update large screen translations." into honeycomb
...
* commit '14541aa94ced88637bd48c7f138fcac042e5c8d9':
Update large screen translations.
2011-01-14 14:06:16 -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
af60097a2d
am 7143ae39: am 94613752: Merge "Rework action bar menus." into honeycomb
...
* commit '7143ae39d60f385cddf18ae0cd3881127598bbf9':
Rework action bar menus.
2011-01-14 14:00:00 -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
Scott Main
614232f774
Merge "docs: Rewrite of App Fundamentals.. Part 2. This introduces three new docs:"
2011-01-14 13:24:02 -08:00
Marco Nelissen
df89226182
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
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
a9ac7b8b92
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
4800da5aea
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
b79bcb7666
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
2513b082b7
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
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