Commit Graph

31368 Commits

Author SHA1 Message Date
Scott Main
229042cb48 am dd7617b3: am 0722cec0: Merge "docs: fix error in common tasks code snippet and add redirects to all faq docs from /guide to docs in /resources bug:3475300" into honeycomb
* commit 'dd7617b3276c0a666c17ae2fb3ab02d5dce4b354':
  docs: fix error in common tasks code snippet and add redirects to all faq docs from /guide to docs in /resources bug:3475300
2011-03-10 15:57:34 -08:00
Xia Wang
af268fff07 am cf994cc5: Merge "resolved conflicts for merge of 16cbe575 to honeycomb-mr1" into honeycomb-mr1
* commit 'cf994cc57df33121cea7a0082c8ea55ca125279c':
  Add WifiStressTest to Wi-Fi only test suite.
2011-03-10 15:57:27 -08:00
Scott Main
0b01fccb6d am 0722cec0: Merge "docs: fix error in common tasks code snippet and add redirects to all faq docs from /guide to docs in /resources bug:3475300" into honeycomb
* commit '0722cec0f1e921a1d12d3c0dbb8b135d309b2031':
  docs: fix error in common tasks code snippet and add redirects to all faq docs from /guide to docs in /resources bug:3475300
2011-03-10 15:40:23 -08:00
Xia Wang
416132888b Merge "resolved conflicts for merge of 16cbe575 to honeycomb-mr1" into honeycomb-mr1 2011-03-10 15:29:12 -08:00
Scott Main
ffb7903b47 Merge "docs: fix error in common tasks code snippet and add redirects to all faq docs from /guide to docs in /resources bug:3475300" into honeycomb 2011-03-10 15:13:49 -08:00
Rajneesh Chowdury
ba0f2a3467 am a7118e33: Merge "Fix for 4080402 NPE in Transition.setDuration" into honeycomb-mr1
* commit 'a7118e33b494b26bfbd37c895a1c412cd5da56ec':
  Fix for 4080402 NPE in Transition.setDuration
2011-03-10 15:12:34 -08:00
Rajneesh Chowdury
85df20657a Merge "Fix for 4080402 NPE in Transition.setDuration" into honeycomb-mr1 2011-03-10 15:10:39 -08:00
Xia Wang
e37f468ed4 resolved conflicts for merge of 16cbe575 to honeycomb-mr1
Change-Id: Ic55f0bdeb5fc63bdabb4f4546fa7e1aa3201a6e0
2011-03-10 15:09:46 -08:00
Eric Fischer
29b37fc799 am ff25b975: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit 'ff25b975052ddf0e74627cccca742cddd1c8e2f2':
  Import revised translations.  DO NOT MERGE
2011-03-10 14:47:57 -08:00
Eric Fischer
8e59190afd Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-10 14:46:18 -08:00
Xia Wang
696229eecf Merge "Add WifiStressTest to Wi-Fi only test suite." into honeycomb 2011-03-10 14:21:50 -08:00
Justin Ho
94b95f7ee5 am fa1d72c8: Merge "New textfield search assets Bug: 3321263" into honeycomb-mr1
* commit 'fa1d72c894af5b2ab622a1d7612a3307d3f8b2e1':
  New textfield search assets Bug: 3321263
2011-03-10 13:55:21 -08:00
Justin Ho
5600135d77 Merge "New textfield search assets Bug: 3321263" into honeycomb-mr1 2011-03-10 13:53:48 -08:00
Eric Fischer
e00be2b00d am 8d257f85: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '8d257f85acc3316b9ba451337f7cbea9000eb8cf':
  Import revised translations.  DO NOT MERGE
2011-03-10 13:46:28 -08:00
Eric Fischer
6f186ab677 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-10 11:42:24 -08:00
Shimeng (Simon) Wang
b3f3a843b7 am 0837fde9: Merge "Don\'t limit zoom scale change by the minimum increment." into honeycomb-mr1
* commit '0837fde9fd9e29f8ef66a3fe00764e15a6f3d515':
  Don't limit zoom scale change by the minimum increment.
2011-03-10 09:07:22 -08:00
Kristian Monsen
addcaaa689 am 79b87df5: Merge "Fix for bug 4064291 WebView uses PackageManager#getInstalledApps" into honeycomb-mr1
* commit '79b87df58861faeedd85804f6ea4f24eb67aef12':
  Fix for bug 4064291 WebView uses PackageManager#getInstalledApps
2011-03-10 09:05:18 -08:00
Shimeng (Simon) Wang
f5022eebf3 Merge "Don't limit zoom scale change by the minimum increment." into honeycomb-mr1 2011-03-10 09:04:12 -08:00
Kristian Monsen
63d02e0b7f Merge "Fix for bug 4064291 WebView uses PackageManager#getInstalledApps" into honeycomb-mr1 2011-03-10 09:01:58 -08:00
Mike Lockwood
8f6c4b055a am cc08c439: Merge "UsbAccessory: Add URI string, replace type string with description" into honeycomb-mr1
* commit 'cc08c439bc7b0afbdafc5ca18c584d2f7724f3df':
  UsbAccessory: Add URI string, replace type string with description
2011-03-10 07:52:30 -08:00
Mike Lockwood
14c2c61a31 Merge "UsbAccessory: Add URI string, replace type string with description" into honeycomb-mr1 2011-03-10 07:50:30 -08:00
TK MUN
e83a221b15 am c01fd043: (-s ours) am 4bdab175: DO NOT MERGE WiMAX support
* commit 'c01fd043a92462f12210d45a92d751b49e0e1f62':
  DO NOT MERGE WiMAX support
2011-03-09 22:58:12 -08:00
TK MUN
b425516715 am 4bdab175: DO NOT MERGE WiMAX support
* commit '4bdab1751f0db3b2f03e8c58ef5c11a543dfa3c7':
  DO NOT MERGE WiMAX support
2011-03-09 22:54:44 -08:00
Jeff Brown
79f410478e am 3de30a4c: Update API.
* commit '3de30a4c1e48d92af14154abddd4fb6fe0c6aa13':
  Update API.
2011-03-09 19:35:28 -08:00
Jeff Brown
4a5f036881 am efd3266b: Input improvements and bug fixes.
* commit 'efd3266b719eed5f1b217021c0a9e76e4b274b06':
  Input improvements and bug fixes.
2011-03-09 18:36:52 -08:00
Jeff Brown
0e4b6af3cf am 9e8e40cb: Recognize 3D joysticks. (DO NOT MERGE)
* commit '9e8e40cb5f8aeb0702002eee60d1ce394bf699ee':
  Recognize 3D joysticks.  (DO NOT MERGE)
2011-03-09 18:36:46 -08:00
Jeff Brown
46689da7ee Input improvements and bug fixes.
Associate each motion axis with the source from which it comes.
It is possible for multiple sources of the same device to define
the same axis.  This fixes new API that was introduced in MR1.
(Bug: 4066146)

Fixed a bug that might cause a segfault when using a trackball.

Only fade out the mouse pointer when touching the touch screen,
ignore other touch pads.

Changed the plural "sources" to "source" in several places in
the InputReader where we intend to refer to a particular source
rather than to a combination of sources.

Improved the batching code to support batching events from different
sources of the same device in parallel.  (Bug: 3391564)

Change-Id: I0189e18e464338f126f7bf94370b928e1b1695f2
2011-03-09 18:30:28 -08:00
Jeff Brown
287b193a1e am 18955491: Merge "Fix off by one errors in touch motion ranges. (DO NOT MERGE)" into honeycomb-mr1
* commit '18955491ee52aad9bfe6f06e46da77aed6ee092a':
  Fix off by one errors in touch motion ranges.  (DO NOT MERGE)
2011-03-09 18:29:31 -08:00
Jeff Brown
ae2537cdd4 am 55605c9e: Merge "Support POLICY_FLAG_ALT et. al. (DO NOT MERGE)" into honeycomb-mr1
* commit '55605c9e24887693d507f31bee4cde0690bbccff':
  Support POLICY_FLAG_ALT et. al.  (DO NOT MERGE)
2011-03-09 18:29:26 -08:00
Jeff Brown
9aeadd5fe1 am 06a0c9f5: Merge "Make PointerLocationView also log generic motions and some keys. (DO NOT MERGE)" into honeycomb-mr1
* commit '06a0c9f5ee1f1c51607446f29ffb9697fa95e549':
  Make PointerLocationView also log generic motions and some keys.  (DO NOT MERGE)
2011-03-09 18:29:22 -08:00
Jeff Brown
95913fe87e Merge "Fix off by one errors in touch motion ranges. (DO NOT MERGE)" into honeycomb-mr1 2011-03-09 18:27:25 -08:00
Jeff Brown
275f0072af Merge "Support POLICY_FLAG_ALT et. al. (DO NOT MERGE)" into honeycomb-mr1 2011-03-09 18:27:22 -08:00
Jeff Brown
02604e0e24 Merge "Make PointerLocationView also log generic motions and some keys. (DO NOT MERGE)" into honeycomb-mr1 2011-03-09 18:27:16 -08:00
Dianne Hackborn
fe25658aaf am 7fd98159: Merge "Fix issue #4066157: ActivityManager.getMemoryClass() returning large memory class" into honeycomb-mr1
* commit '7fd981598ed0ec275d6da27c71e5e6c9db854e82':
  Fix issue #4066157: ActivityManager.getMemoryClass() returning large memory class
2011-03-09 18:02:53 -08:00
Dianne Hackborn
a7cdea8471 Merge "Fix issue #4066157: ActivityManager.getMemoryClass() returning large memory class" into honeycomb-mr1 2011-03-09 18:00:10 -08:00
Mathias Agopian
dcc9dd2486 am a15b5290: (-s ours) am 33029221: Merge "revert the surface purgatory list and dependent changes." into gingerbread
* commit 'a15b5290f5785031ec4813fd7e141a9fc39c18fa':
  revert the surface purgatory list and dependent changes.
2011-03-09 17:17:24 -08:00
Mathias Agopian
18570db84e am 33029221: Merge "revert the surface purgatory list and dependent changes." into gingerbread
* commit '33029221619f14577bd0d0e7c2f815abc8f1b8ea':
  revert the surface purgatory list and dependent changes.
2011-03-09 17:11:10 -08:00
Mathias Agopian
c1315657bd Merge "revert the surface purgatory list and dependent changes." into gingerbread 2011-03-09 17:07:27 -08:00
Mathias Agopian
e8e834802d am b4341ba6: (-s ours) am b710a50a: Merge "fix [3452750] Issue 14634: SensorManager.getRotationMatrixFromVector gets NaN-Values [external] [DO NOT MERGE]" into gingerbread
* commit 'b4341ba69750cb71a949525bde4ba962c54908e5':
  fix [3452750] Issue 14634: SensorManager.getRotationMatrixFromVector gets NaN-Values [external] [DO NOT MERGE]
2011-03-09 17:06:10 -08:00
Mathias Agopian
b20e125f43 am a7c836dd: (-s ours) am c05d35db: Merge "fix [4026375] SensorManager quaternion functions can call sqrt with a negative number [DO NOT MERGE]" into gingerbread
* commit 'a7c836ddc0d726120368bf692088f97286e0af3a':
  fix [4026375] SensorManager quaternion functions can call sqrt with a negative number [DO NOT MERGE]
2011-03-09 17:06:06 -08:00
Joe Malin
366e295ec0 am 87e8ab37: am b56cb53f: Merge "DOC CHANGE: Add IntelliJ to Dev Guide" into honeycomb
* commit '87e8ab372bd722c5c1a00ff5262acccee5dae5e5':
  DOC CHANGE: Add IntelliJ to Dev Guide
2011-03-09 17:04:18 -08:00
Joe Malin
87c3bfac18 am b56cb53f: Merge "DOC CHANGE: Add IntelliJ to Dev Guide" into honeycomb
* commit 'b56cb53f89176d2000e6b6a7aad10b88102abeb8':
  DOC CHANGE: Add IntelliJ to Dev Guide
2011-03-09 17:02:28 -08:00
Mathias Agopian
f7662afb76 revert the surface purgatory list and dependent changes.
6d0f6cb Revert "Fix [3513017] in lockscreen but showing empty launcher (live wallpaper) only"
6154412 Revert "partially fix [3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)"
37c2a37 fix [3408713] Dialog window invisible sometimes

It looks like there is a surface leak, it's unclear where it is.
Without those reverts, this would cause a leak of the associated buffers
which is far more problematic. this change might hide the surface leak.

Bug: 4078032
Change-Id: Iedcda3ffcdd2f69d41047b5c3134c1e867ff90d7
2011-03-09 17:00:41 -08:00
Joe Malin
3d9f7dcebd Merge "DOC CHANGE: Add IntelliJ to Dev Guide" into honeycomb 2011-03-09 16:58:29 -08:00
Mathias Agopian
9d0cbdad36 am b710a50a: Merge "fix [3452750] Issue 14634: SensorManager.getRotationMatrixFromVector gets NaN-Values [external] [DO NOT MERGE]" into gingerbread
* commit 'b710a50ab6ca36b502f548e8551f620e98bbb1d8':
  fix [3452750] Issue 14634: SensorManager.getRotationMatrixFromVector gets NaN-Values [external] [DO NOT MERGE]
2011-03-09 16:57:32 -08:00
Mathias Agopian
1233dca6a9 am c05d35db: Merge "fix [4026375] SensorManager quaternion functions can call sqrt with a negative number [DO NOT MERGE]" into gingerbread
* commit 'c05d35db1c57de97888f16ed74718e4c676e4a9b':
  fix [4026375] SensorManager quaternion functions can call sqrt with a negative number [DO NOT MERGE]
2011-03-09 16:57:28 -08:00
Mathias Agopian
e379402df1 Merge "fix [3452750] Issue 14634: SensorManager.getRotationMatrixFromVector gets NaN-Values [external] [DO NOT MERGE]" into gingerbread 2011-03-09 16:54:21 -08:00
Mathias Agopian
9e62542dcb Merge "fix [4026375] SensorManager quaternion functions can call sqrt with a negative number [DO NOT MERGE]" into gingerbread 2011-03-09 16:54:14 -08:00
Adam Powell
74b4bf2b6e am 0175e945: Merge "Fix external bug http://code.google.com/p/android/issues/detail?id=15183" into honeycomb-mr1
* commit '0175e945bb14b2208e00a3a7c9c35261981499a8':
  Fix external bug http://code.google.com/p/android/issues/detail?id=15183
2011-03-09 16:48:20 -08:00
Adam Powell
aca0345e25 Merge "Fix external bug http://code.google.com/p/android/issues/detail?id=15183" into honeycomb-mr1 2011-03-09 16:45:57 -08:00