Commit Graph

26670 Commits

Author SHA1 Message Date
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
James Dong b1f1d0ede6 Merge "Squash commits of the following patches, cherry-picked from other branch - do not merge." into gingerbread 2011-01-14 16:27:48 -08:00
Guang Zhu 73e6de2885 Merge "when test case times out, stop loading first" into honeycomb 2011-01-14 16:26:30 -08:00
Jaikumar Ganesh d8bfcd6f37 am a788a943: Merge "Do Not Merge: Expose insecure rfcomm Bluetooth API." into gingerbread
* commit 'a788a9430956dabbc1387e5cccc15f9f41639c95':
  Do Not Merge: Expose insecure rfcomm Bluetooth API.
2011-01-14 16:15:29 -08:00
Jaikumar Ganesh 824bb889ff Merge "Do Not Merge: Expose insecure rfcomm Bluetooth API." into gingerbread 2011-01-14 16:11:41 -08:00
Dianne Hackborn 911dd2ef0b am 7d234fab: Merge "Don\'t drop the drawable cache completely on configuration change"
* commit '7d234fabe61cd5f034fe4ff4484209fbf5130c4d':
  Don't drop the drawable cache completely on configuration change
2011-01-14 16:11:40 -08:00
Dianne Hackborn 861e5cada8 am c3d0d860: Merge "Make the Phone options dialog use current language"
* commit 'c3d0d860b6f9c6b5b09ef2ae62d59139453299dd':
  Make the Phone options dialog use current language
2011-01-14 16:11:35 -08:00
Dianne Hackborn 2703442bd4 am 0950a3ef: Merge "Added check to make orientation calculations more robust"
* commit '0950a3ef3610184858466a4dfeb1c11c3b1ed0aa':
  Added check to make orientation calculations more robust
2011-01-14 16:11:24 -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
Dianne Hackborn ac9de03486 am 29c99aaa: Merge "Added check to make orientation calculations more robust" into gingerbread
* commit '29c99aaaaed00c605fb6cd64de169fafad0e40ed':
  Added check to make orientation calculations more robust
2011-01-14 15:39:41 -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 05186bbe9f Merge "Don't drop the drawable cache completely on configuration change" 2011-01-14 15:37:56 -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
Dianne Hackborn e0aa3e5dd6 Merge "Make the Phone options dialog use current language" 2011-01-14 15:36:58 -08:00
Dianne Hackborn 2e68f7e7ef Merge "Added check to make orientation calculations more robust" 2011-01-14 15:36:52 -08:00
Dianne Hackborn 6d3c5ae222 Merge "Added check to make orientation calculations more robust" into gingerbread 2011-01-14 15:36:26 -08:00
satok 0b9a81ac66 Merge "switchToLastInputMethod returns a implicitly enabled subtype in the history" into honeycomb 2011-01-14 15:35:53 -08:00
Dianne Hackborn d244b218be am c058bf00: Merge "Make the Phone options dialog use current language" into gingerbread
* commit 'c058bf0043290f098fb487ee33e0da13f00134f2':
  Make the Phone options dialog use current language
2011-01-14 15:35:52 -08:00
Romain Guy 43b7c9aec8 Merge "Don't delete objects twice..." into honeycomb 2011-01-14 15:35:34 -08:00
Dianne Hackborn 12edc159a3 Merge "Make the Phone options dialog use current language" into gingerbread 2011-01-14 15:33:44 -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