Gilles Debunne
9646145dec
Merge "Fixed TextView#onTextChanged documentation."
2011-03-10 10:21:20 -08:00
Shimeng (Simon) Wang
83c590a2fa
am 40f24016: am 0837fde9: Merge "Don\'t limit zoom scale change by the minimum increment." into honeycomb-mr1
...
* commit '40f240166a5d4c92690aeb991f1711bf3a733ef5':
Don't limit zoom scale change by the minimum increment.
2011-03-10 09:49:49 -08:00
Kristian Monsen
9610d3e98f
am 4543b8d4: am 79b87df5: Merge "Fix for bug 4064291 WebView uses PackageManager#getInstalledApps" into honeycomb-mr1
...
* commit '4543b8d4b0fe6bebbf619fa7793a55e41eb1eeff':
Fix for bug 4064291 WebView uses PackageManager#getInstalledApps
2011-03-10 09:49:42 -08:00
Shimeng (Simon) Wang
40f240166a
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
4543b8d4b0
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
0837fde9fd
Merge "Don't limit zoom scale change by the minimum increment." into honeycomb-mr1
2011-03-10 09:04:12 -08:00
Kristian Monsen
79b87df588
Merge "Fix for bug 4064291 WebView uses PackageManager#getInstalledApps" into honeycomb-mr1
2011-03-10 09:01:58 -08:00
Mike Lockwood
26d7eef69e
am 84edf14b: am cc08c439: Merge "UsbAccessory: Add URI string, replace type string with description" into honeycomb-mr1
...
* commit '84edf14b62eaf3304252bb76b0b2ca3f518c8d54':
UsbAccessory: Add URI string, replace type string with description
2011-03-10 07:56:59 -08:00
Mike Lockwood
84edf14b62
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
cc08c439bc
Merge "UsbAccessory: Add URI string, replace type string with description" into honeycomb-mr1
2011-03-10 07:50:30 -08:00
Kristian Monsen
63a1b0cefe
Fix for bug 4064291 WebView uses PackageManager#getInstalledApps
...
Checking each app if they exist instead of iterating through
all packages.
Change-Id: Ic4934fa1e8dbbab2f90134e3701d39b1d4739d83
2011-03-10 11:30:43 +00:00
Mike Lockwood
ac36d7c715
UsbAccessory: Add URI string, replace type string with description
...
This is a first step toward adding USB accessory URI support
BUG: 4073248
Modified USB accessory matching logic to look only at manufacturer, model and version
(description and URI are not considered when matching apps to accessories)
Also added test for USB accessory protocol version to accessorytest
BUG: 4080288
Change-Id: I992a3433c74efa7a7db37bf030f02c1f0c92f9e2
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-09 22:12:49 -05:00
Jeff Brown
5a3d6cc188
am e6f0ae12: am efd3266b: Input improvements and bug fixes.
...
* commit 'e6f0ae12b18819424dd8395b433a8fc9caefa77b':
Input improvements and bug fixes.
2011-03-09 18:39:46 -08:00
Jeff Brown
e6f0ae12b1
am efd3266b: Input improvements and bug fixes.
...
* commit 'efd3266b719eed5f1b217021c0a9e76e4b274b06':
Input improvements and bug fixes.
2011-03-09 18:36:52 -08:00
Jeff Brown
efd3266b71
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
e229621219
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
18955491ee
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
06a0c9f5ee
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
439cca140a
am f49c3ae2: am 7fd98159: Merge "Fix issue #4066157 : ActivityManager.getMemoryClass() returning large memory class" into honeycomb-mr1
...
* commit 'f49c3ae2da7b6343088200bdafdf6e9906258bf4':
Fix issue #4066157 : ActivityManager.getMemoryClass() returning large memory class
2011-03-09 18:05:40 -08:00
Dianne Hackborn
f49c3ae2da
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
7fd981598e
Merge "Fix issue #4066157 : ActivityManager.getMemoryClass() returning large memory class" into honeycomb-mr1
2011-03-09 18:00:10 -08:00
Shimeng (Simon) Wang
3911b45005
Don't limit zoom scale change by the minimum increment.
...
issue: 4080125
Change-Id: I3fa258e12e7aa44c7286c9dccb1f249d5ae78a12
2011-03-09 17:55:35 -08:00
Gilles Debunne
4469e60e9e
Fixed TextView#onTextChanged documentation.
...
Bug https://code.google.com/p/android/issues/detail?id=14804
Change-Id: I3356800b680ff79cc2fe099845634bb8d9b96ec6
2011-03-09 17:20:36 -08:00
Adam Powell
8975157cd4
am 94929217: am 0175e945: Merge "Fix external bug http://code.google.com/p/android/issues/detail?id=15183 " into honeycomb-mr1
...
* commit '94929217ae3fd4c577ed8b0f0391958de95bfaec':
Fix external bug http://code.google.com/p/android/issues/detail?id=15183
2011-03-09 16:50:54 -08:00
Adam Powell
94929217ae
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
0175e945bb
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
Adam Powell
7ee1ff1450
Fix external bug http://code.google.com/p/android/issues/detail?id=15183
...
Prevent overflow in FastScroller indexing
Change-Id: I53f90feaefd49717a0bdaddcf9a4988318d40c7d
2011-03-09 16:35:13 -08:00
Wei-Ta Chen
1f507be1c1
am a2048056: am 2498b4b8: Merge "Fix 3510563: memory leak in BitmapRegionDecoder." into honeycomb-mr1
...
* commit 'a204805627eddeac0a1777c69ce62d31d339d4cd':
Fix 3510563: memory leak in BitmapRegionDecoder.
2011-03-09 16:27:25 -08:00
Wei-Ta Chen
a204805627
am 2498b4b8: Merge "Fix 3510563: memory leak in BitmapRegionDecoder." into honeycomb-mr1
...
* commit '2498b4b8c6b02d553f46f9b48eee9d5295d36f16':
Fix 3510563: memory leak in BitmapRegionDecoder.
2011-03-09 16:25:24 -08:00
Wei-Ta Chen
2498b4b8c6
Merge "Fix 3510563: memory leak in BitmapRegionDecoder." into honeycomb-mr1
2011-03-09 16:21:53 -08:00
Dianne Hackborn
460d2c1886
am de478eca: am 7b5cb3c0: Merge "Fix issue #4068088 : NPE at com.android.internal.os.BatteryStatsImpl..." into honeycomb-mr1
...
* commit 'de478eca19adc263c033d777b0e6a33c8113fd24':
Fix issue #4068088 : NPE at com.android.internal.os.BatteryStatsImpl...
2011-03-09 15:53:46 -08:00
Dianne Hackborn
de478eca19
am 7b5cb3c0: Merge "Fix issue #4068088 : NPE at com.android.internal.os.BatteryStatsImpl..." into honeycomb-mr1
...
* commit '7b5cb3c033f758368580664a8bdad43b47f3682d':
Fix issue #4068088 : NPE at com.android.internal.os.BatteryStatsImpl...
2011-03-09 15:50:34 -08:00
Dianne Hackborn
7b5cb3c033
Merge "Fix issue #4068088 : NPE at com.android.internal.os.BatteryStatsImpl..." into honeycomb-mr1
2011-03-09 15:47:24 -08:00
Huahui Wu
23ad53d231
am a1555b8f: am 37c2e3e5: Merge "b/4075349 Make the pinch to zoom more responsive after limits." into honeycomb-mr1
...
* commit 'a1555b8fa613b6374d2453fa73ff8eb1c1dfffc3':
b/4075349 Make the pinch to zoom more responsive after limits.
2011-03-09 15:42:14 -08:00
Huahui Wu
a1555b8fa6
am 37c2e3e5: Merge "b/4075349 Make the pinch to zoom more responsive after limits." into honeycomb-mr1
...
* commit '37c2e3e55641e91dd0ec3dbd296bc6bc7c7641cf':
b/4075349 Make the pinch to zoom more responsive after limits.
2011-03-09 15:39:56 -08:00
Huahui Wu
37c2e3e556
Merge "b/4075349 Make the pinch to zoom more responsive after limits." into honeycomb-mr1
2011-03-09 15:37:56 -08:00
Huahui Wu
ff6f4c2eff
b/4075349 Make the pinch to zoom more responsive after limits.
...
Change-Id: I66ea0aa95ff6a471b7c2ae2cb1ce2fdd0f18ce01
2011-03-09 15:13:01 -08:00
Mathias Agopian
c3e8bddecf
am 176e7108: am 838aa45b: Merge "fix [4026375] SensorManager quaternion functions can call sqrt with a negative number" into honeycomb-mr1
...
* commit '176e71081b17787652c778cd115e079199dac536':
fix [4026375] SensorManager quaternion functions can call sqrt with a negative number
2011-03-09 14:36:05 -08:00
Mathias Agopian
176e71081b
am 838aa45b: Merge "fix [4026375] SensorManager quaternion functions can call sqrt with a negative number" into honeycomb-mr1
...
* commit '838aa45b99f504596971063003fa8a75e89e4c41':
fix [4026375] SensorManager quaternion functions can call sqrt with a negative number
2011-03-09 14:32:47 -08:00
Mathias Agopian
838aa45b99
Merge "fix [4026375] SensorManager quaternion functions can call sqrt with a negative number" into honeycomb-mr1
2011-03-09 14:30:16 -08:00
Leon Scroggins
2408954d7b
am e1413a9e: am 23c5861c: Merge "Scroll textfield onscreen when the IME shows." into honeycomb-mr1
...
* commit 'e1413a9e9cdb2dd2792d318542db483b188276c8':
Scroll textfield onscreen when the IME shows.
2011-03-09 14:25:10 -08:00
Leon Scroggins
e1413a9e9c
am 23c5861c: Merge "Scroll textfield onscreen when the IME shows." into honeycomb-mr1
...
* commit '23c5861cde7efef568fa3c61e0f1fa4fe97c7cfa':
Scroll textfield onscreen when the IME shows.
2011-03-09 14:22:50 -08:00
Leon Scroggins
23c5861cde
Merge "Scroll textfield onscreen when the IME shows." into honeycomb-mr1
2011-03-09 14:21:17 -08:00
Huahui Wu
02d7fe1326
am 45e5db99: am 166b190e: Merge "b/3307761 Clean up the flag mIsHandlingMultiTouch." into honeycomb-mr1
...
* commit '45e5db99979d9f85e7c3cad3e750b886e3abb105':
b/3307761 Clean up the flag mIsHandlingMultiTouch.
2011-03-09 14:07:20 -08:00
Huahui Wu
45e5db9997
am 166b190e: Merge "b/3307761 Clean up the flag mIsHandlingMultiTouch." into honeycomb-mr1
...
* commit '166b190efc35b7ddad6b011ba537c177e88a2336':
b/3307761 Clean up the flag mIsHandlingMultiTouch.
2011-03-09 14:04:52 -08:00
Dianne Hackborn
32de2f67ea
Fix issue #4068088 : NPE at com.android.internal.os.BatteryStatsImpl...
...
...addHistoryRecordLocked(BatteryStatsImpl.java:1210)
It was doing a bunch of stuff without holding a lock!
Change-Id: Ie5b56514370e0bfc87ba7737d75e01df0859817e
2011-03-09 14:03:35 -08:00
Huahui Wu
166b190efc
Merge "b/3307761 Clean up the flag mIsHandlingMultiTouch." into honeycomb-mr1
2011-03-09 13:55:35 -08:00
Leon Scroggins
d69b701284
Scroll textfield onscreen when the IME shows.
...
Bug:4079218
Change-Id: I69fe49582effe664c2288401871922a2cacc7c9c
2011-03-09 16:18:28 -05:00
Ed Heyl
e888b25fb5
am cc7d3c53: am b22bb1da: Merge "UsbManager: Fix broken Javadoc links" into honeycomb-mr1
...
* commit 'cc7d3c539abd4affd5e95cff8740d9303deac63d':
UsbManager: Fix broken Javadoc links
2011-03-09 13:06:36 -08:00
Ed Heyl
cc7d3c539a
am b22bb1da: Merge "UsbManager: Fix broken Javadoc links" into honeycomb-mr1
...
* commit 'b22bb1dae1213fe9383020a53eeb89de40e7bbd0':
UsbManager: Fix broken Javadoc links
2011-03-09 12:56:17 -08:00