40445 Commits

Author SHA1 Message Date
Jeff Brown
48eea948dc am 195f13b8: am 1061b966: Merge "Fix bug with mice that send multiple BTN_MOUSE values." into honeycomb
* commit '195f13b803e26375d58d03dd61099f586d86ea8c':
  Fix bug with mice that send multiple BTN_MOUSE values.
2011-01-16 10:41:03 -08:00
Xavier Ducrohet
47b130e219 am c9770b36: am 72fcd0a4: Merge "LayoutLib: update logs to use new data bundle" into honeycomb
* commit 'c9770b36144827e6a68ac12d1a61816f2dcdb236':
  LayoutLib: update logs to use new data bundle
2011-01-16 10:40:48 -08:00
Romain Guy
720b3ee1b1 am 2be00ccb: am 8dd5b1e5: Prevent NPE when a View is detached without having been attached. Bug #3355252
* commit '2be00ccbe7c8e2aedfa15b6b7c469160734dda15':
  Prevent NPE when a View is detached without having been attached. Bug #3355252
2011-01-16 10:40:38 -08:00
Jeff Brown
db10a638fd am 12116af5: am c8276990: Merge "Add volume down as a safe mode key for Stingray." into honeycomb
* commit '12116af5c422608d609ec884939ee8ceba3279b9':
  Add volume down as a safe mode key for Stingray.
2011-01-16 10:40:20 -08:00
Jeff Brown
195f13b803 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
1061b96635 Merge "Fix bug with mice that send multiple BTN_MOUSE values." into honeycomb 2011-01-14 17:43:12 -08:00
Xavier Ducrohet
c9770b3614 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
72fcd0a4a9 Merge "LayoutLib: update logs to use new data bundle" into honeycomb 2011-01-14 17:30:22 -08:00
Romain Guy
8dd5b1e531 Prevent NPE when a View is detached without having been attached.
Bug #3355252

Change-Id: I58e03983ccf6a27a24619ec0f49659d6d7cc0a64
2011-01-14 17:28:51 -08:00
Romain Guy
2be00ccbe7 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
12116af5c4 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
1c9d06e047 Fix bug with mice that send multiple BTN_MOUSE values.
Some mice send different values for BTN_MOUSE key events
when the button is held down (2 for repeat, instead of 1 for down).

Change-Id: I803db1f1584f50f8f5e1d37b6a715e2e1b3943a6
2011-01-14 17:24:16 -08:00
Jeff Brown
c8276990df Merge "Add volume down as a safe mode key for Stingray." into honeycomb 2011-01-14 17:22:53 -08:00
Adam Cohen
681183414f am 288d9fe9: am 69d66e00: Fixing StackView rotation bugs
* commit '288d9fe943226714bc9cb3529cb306bc3fc6f82d':
  Fixing StackView rotation bugs
2011-01-14 17:07:09 -08:00
Adam Cohen
288d9fe943 am 69d66e00: Fixing StackView rotation bugs
* commit '69d66e00136f67332c992326a7b2eb334eeb32a2':
  Fixing StackView rotation bugs
2011-01-14 17:05:14 -08:00
Xavier Ducrohet
51a7e5447d LayoutLib: update logs to use new data bundle
Also change some resource.resolve tags to resource.format

Change-Id: I3f0b0d2eb69a5ec98375e4014a3bb1bfceb8c855
2011-01-14 16:56:00 -08:00
Adam Cohen
69d66e0013 Fixing StackView rotation bugs
Change-Id: Iaf9482734ca73238f82d180700389593df9c7eac
2011-01-14 16:54:41 -08:00
Guang Zhu
c4c0ae73af am e9ecd747: am 44060f4d: Merge "when test case times out, stop loading first" into honeycomb
* commit 'e9ecd7471c8f09830b652f9e8543e2970d187e6a':
  when test case times out, stop loading first
2011-01-14 16:31:25 -08:00
Guang Zhu
e9ecd7471c 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
44060f4d76 Merge "when test case times out, stop loading first" into honeycomb 2011-01-14 16:26:30 -08:00
Guang Zhu
4ce6e7c433 when test case times out, stop loading first
current timeout mechanism does a text dump and then move to next case.
sometimes the text dump causes WebView to spin, and doing a
stopLoading seems to resolve some of the cases.

Change-Id: Iae08f9c93b2da3e805cacae43f80083fdf1bc5e1
2011-01-14 16:17:20 -08:00
Dianne Hackborn
57e6e65dcf am 92e787e2: (-s ours) am 751fdd9a: Merge "DO NOT MERGE Make the Phone options dialog use current language" into honeycomb
* commit '92e787e201b1ce2c6536df89532617da48a1ae92':
  DO NOT MERGE Make the Phone options dialog use current language
2011-01-14 16:09:26 -08:00
Dianne Hackborn
e55370d7d2 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
92e787e201 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
a347733000 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
751fdd9ab3 Merge "DO NOT MERGE Make the Phone options dialog use current language" into honeycomb 2011-01-14 16:02:22 -08:00
Dianne Hackborn
88471b2563 Merge "DO NOT MERGE Added check to make orientation calculations more robust" into honeycomb 2011-01-14 16:02:07 -08:00
Niclas Kellgren
fcbbb31f27 DO NOT MERGE Added check to make orientation calculations more robust
Added check avoid a division by zero resulting in NaN which in turn
makes checkFullyTilted to ignore high tilt angles from then on.
If (x, y, z) == (0, 0, 0) then there is no tilt or rotation and
this vector must be ignored. This check is extended to ignore all
small acceleration values where noise can be of big influence.

Low or zero readings can happen when space travelling free falling,
but more commonly when shaking or getting bad readings from the sensor.
The accelerometer is turned off when not used and polling it too soon
after it is turned on may result in (0, 0, 0).

Change-Id: I7b61b77c8a9d4e137bf6352b84f0c358d93c82ae
2011-01-14 16:01:20 -08:00
Anders Hammar1
0ce53b47d6 DO NOT MERGE Make the Phone options dialog use current language
The title of the Phone options dialog is displayed using wrong
translation if the user changes the current language setting. Moving
the setTitle call to prepareDialog to ensure that the title gets
updated before the dialog is shown.

Change-Id: I6f8f460789effd22de5be8339cc46667269e78c0
2011-01-14 16:00:47 -08:00
Scott Main
3ac722032e 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
3597e9964b 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
2ef7081bc7 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
f445a88009 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
7bd540ac8e 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
6f92dbc49f Merge "fix sdk build breakage; remove invalid @note tag" into honeycomb 2011-01-14 15:42:35 -08:00
Dianne Hackborn
909d447d8a 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
37d997f766 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
40ce2cafaf 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
8e4d3ba678 Merge "Fix bug 3339039 - Preserve proper behavior for action button text when updated." into honeycomb 2011-01-14 15:40:07 -08:00
Scott Main
2b90a9a714 fix sdk build breakage; remove invalid @note tag
Change-Id: Iaaf5a38388ceccdd0d1f3766523788f54f1dc8d2
2011-01-14 15:39:10 -08:00
satok
fb77a336af 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
2ee3234885 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
Adam Powell
9f125d3415 Fix bug 3339039 - Preserve proper behavior for action button text when
updated.

Change-Id: If3529616d5a2b69638b2b0c4070d5ebbb418410c
2011-01-14 15:37:44 -08:00
Dianne Hackborn
0b08c5cb14 Merge "Don't drop the drawable cache completely on configuration change" into honeycomb 2011-01-14 15:37:28 -08:00
satok
604363dc63 Merge "switchToLastInputMethod returns a implicitly enabled subtype in the history" into honeycomb 2011-01-14 15:35:53 -08:00
Romain Guy
7777319712 Merge "Don't delete objects twice..." into honeycomb 2011-01-14 15:35:34 -08:00
Romain Guy
1f1fcb70b6 Don't delete objects twice...
Change-Id: Ibc67aed098c9300cf45eb46abda1938c418808c3
2011-01-14 15:37:54 -08:00
satok
df31ae6a30 switchToLastInputMethod returns a implicitly enabled subtype in the history
Bug: 3353363

Change-Id: Id5f8a62017880330401ebd3e77d943eb7817e555
2011-01-15 08:34:39 +09:00
Romain Guy
3d43f3b443 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
53179fe394 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