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
Jim Miller
77dd1e9d02
Merge "Fix 3201849: Enable hardware acceleration in LockScreen WaveView"
2011-03-10 14:04:05 -08:00
Justin Ho
e280e97070
am 9caea5ef: am fa1d72c8: Merge "New textfield search assets Bug: 3321263" into honeycomb-mr1
...
* commit '9caea5efd9190fdadc6ab8261c107134eb61df47':
New textfield search assets Bug: 3321263
2011-03-10 13:57:51 -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
Eric Fischer
e48a98358f
am b23196d6: (-s ours) am 8d257f85: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit 'b23196d6475a29d8d973d50e9f9ef867ba486e5d':
Import revised translations. DO NOT MERGE
2011-03-10 13:53:58 -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
Gilles Debunne
277b962db9
Merge "Removed updateCursorControllerPositions hidden method."
2011-03-10 13:36:32 -08:00
Robert Greenwalt
bc4d343181
am dfcb8c51: Merge "Don\'t accept a user-defined dun-capable connection" into gingerbread
...
* commit 'dfcb8c511635431d536fd3ef1894378f4424ef1a':
Don't accept a user-defined dun-capable connection
2011-03-10 11:59:17 -08:00
Eric Fischer
6f186ab677
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
2011-03-10 11:42:24 -08:00
Robert Greenwalt
de528f2bd8
Merge "Don't accept a user-defined dun-capable connection" into gingerbread
2011-03-10 10:41:36 -08:00
Gilles Debunne
030cbd6536
Merge "Empty spans are not considered in text layout/rendering process."
2011-03-10 10:21:34 -08:00
Gilles Debunne
1ff49c4fca
Merge "Fixed TextView#onTextChanged documentation."
2011-03-10 10:21:20 -08:00
Wink Saville
e8516d1a37
Merge "Telephony: Rename lte_on_cdma property."
2011-03-10 09:53:54 -08:00
Shimeng (Simon) Wang
497c0c9ef6
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
4cdf47bca5
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
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
cf4f0a4039
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
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
ee6229ad0c
am ce475995: (-s ours) am c01fd043: (-s ours) am 4bdab175: DO NOT MERGE WiMAX support
...
* commit 'ce475995740942d75eda7af820072c765256ec73':
DO NOT MERGE WiMAX support
2011-03-09 23:03:16 -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
136aa331ae
am 4ffdca06: am 3de30a4c: Update API.
...
* commit '4ffdca06ec5575ddaa215941c1cc21de96e76bcb':
Update API.
2011-03-09 19:37:49 -08:00
Jeff Brown
79f410478e
am 3de30a4c: Update API.
...
* commit '3de30a4c1e48d92af14154abddd4fb6fe0c6aa13':
Update API.
2011-03-09 19:35:28 -08:00
Jeff Brown
15a4fd40c7
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
bc9caa3741
am 0cbc4a6c: (-s ours) am 9e8e40cb: Recognize 3D joysticks. (DO NOT MERGE)
...
* commit '0cbc4a6c3ce795497ac136736dacf5eeb0ffa6ac':
Recognize 3D joysticks. (DO NOT MERGE)
2011-03-09 18:39:43 -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
65a33476c0
am 76d84845: (-s ours) am 18955491: Merge "Fix off by one errors in touch motion ranges. (DO NOT MERGE)" into honeycomb-mr1
...
* commit '76d848454f5d6f8b6d087eccc81c6bb51dd46c55':
Fix off by one errors in touch motion ranges. (DO NOT MERGE)
2011-03-09 18:31:56 -08:00
Jeff Brown
2ee5772f11
am bbb5f5ac: (-s ours) am 55605c9e: Merge "Support POLICY_FLAG_ALT et. al. (DO NOT MERGE)" into honeycomb-mr1
...
* commit 'bbb5f5ac36bdac7ba05b1a563fb9e9f903cc6f5a':
Support POLICY_FLAG_ALT et. al. (DO NOT MERGE)
2011-03-09 18:31:52 -08:00
Jeff Brown
67e66d6c87
am e2296212: (-s ours) am 06a0c9f5: Merge "Make PointerLocationView also log generic motions and some keys. (DO NOT MERGE)" into honeycomb-mr1
...
* commit 'e2296212194a74438d80f77bc3d68d88b1f2be09':
Make PointerLocationView also log generic motions and some keys. (DO NOT MERGE)
2011-03-09 18:31:47 -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
d7a4a0d9b3
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
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
0560b3d748
am abe5c079: am a15b5290: (-s ours) am 33029221: Merge "revert the surface purgatory list and dependent changes." into gingerbread
...
* commit 'abe5c079440a0903085bc748c955d5b2b820a370':
revert the surface purgatory list and dependent changes.
2011-03-09 17:20:01 -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