Commit Graph

26473 Commits

Author SHA1 Message Date
Romain Guy
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
Romain Guy
bcdc73f5a7 Merge "Don't crash Launcher on config change." into honeycomb 2011-01-14 18:49:55 -08:00
Adam Powell
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
Adam Powell
f4f4f36969 Merge "Fix bug 3337711 - Volume panel layout adjustments" into honeycomb 2011-01-14 18:26:01 -08:00
Jeff Brown
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
Jeff Brown
d2690932bd Merge "Make getFallbackAction return false when there is none." into honeycomb 2011-01-14 17:59:56 -08:00
Jeff Brown
9346643577 Make getFallbackAction return false when there is none.
Change-Id: Id17c0f7269e4a228f4e5f11c54614fec508222a2
2011-01-14 17:54:38 -08:00
Jeff Brown
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
Jeff Brown
e45ee8cf48 Merge "Disable soft keyboard when keyboard attached." into honeycomb 2011-01-14 17:48:09 -08:00
Jeff Brown
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
Jeff Brown
f7bd7c5dc5 Merge "Fix bug with mice that send multiple BTN_MOUSE values." into honeycomb 2011-01-14 17:43:12 -08:00
Xavier Ducrohet
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
Xavier Ducrohet
057bba1586 Merge "LayoutLib: update logs to use new data bundle" into honeycomb 2011-01-14 17:30:22 -08:00
Romain Guy
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
Jeff Brown
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
Jeff Brown
6e3544e676 Merge "Add volume down as a safe mode key for Stingray." into honeycomb 2011-01-14 17:22:53 -08:00
Adam Cohen
4f012af11d am 69d66e00: Fixing StackView rotation bugs
* commit '69d66e00136f67332c992326a7b2eb334eeb32a2':
  Fixing StackView rotation bugs
2011-01-14 17:05:14 -08:00
Guang Zhu
12921dd9d9 am 44060f4d: Merge "when test case times out, stop loading first" into honeycomb
* commit '44060f4d76e7625cf2ae6580afa606613ef1cb49':
  when test case times out, stop loading first
2011-01-14 16:29:30 -08:00
Guang Zhu
73e6de2885 Merge "when test case times out, stop loading first" into honeycomb 2011-01-14 16:26:30 -08:00
Dianne Hackborn
382fd42de0 am 751fdd9a: Merge "DO NOT MERGE Make the Phone options dialog use current language" into honeycomb
* commit '751fdd9ab31048d726d551f9098b3f51239376f4':
  DO NOT MERGE Make the Phone options dialog use current language
2011-01-14 16:05:44 -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
1c0fcc5a07 Merge "DO NOT MERGE Make the Phone options dialog use current language" into honeycomb 2011-01-14 16:02:22 -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
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