Jim Miller
37bad9e7ac
am c00c887c: am 5c9248f6: Merge "Fix 4027057: Improve resolution of RecentApps thumbnail images." into honeycomb-mr1
...
* commit 'c00c887c118849ac308f6fb1f6fad28b2929e6bb':
Fix 4027057: Improve resolution of RecentApps thumbnail images.
2011-03-09 15:02:59 -08:00
Robert Ly
16936a4469
am d545a40d: am 788dd5e0: am 2a36cf42: doc change: removing references to eclipse 3.4
...
* commit 'd545a40dc92ea876b58c6e87f6e6724406bb2841':
doc change: removing references to eclipse 3.4
2011-03-09 15:02:54 -08:00
Jim Miller
c00c887c11
am 5c9248f6: Merge "Fix 4027057: Improve resolution of RecentApps thumbnail images." into honeycomb-mr1
...
* commit '5c9248f668201a751500f67cc60bd45ff905751a':
Fix 4027057: Improve resolution of RecentApps thumbnail images.
2011-03-09 14:59:26 -08:00
Robert Ly
d545a40dc9
am 788dd5e0: am 2a36cf42: doc change: removing references to eclipse 3.4
...
* commit '788dd5e076821d8604be7a8e44a1c5ae5f4e198e':
doc change: removing references to eclipse 3.4
2011-03-09 14:59:17 -08:00
Jim Miller
5c9248f668
Merge "Fix 4027057: Improve resolution of RecentApps thumbnail images." into honeycomb-mr1
2011-03-09 14:42:56 -08:00
Andreas Huber
fa715315b2
Merge "Use the same http proxy mechanism that webkit uses instead of bypassing proxies."
2011-03-09 14:42:12 -08:00
Robert Ly
788dd5e076
am 2a36cf42: doc change: removing references to eclipse 3.4
...
* commit '2a36cf42fa6f941b2a55f7f391d79b93b8f780f4':
doc change: removing references to eclipse 3.4
2011-03-09 14:39:55 -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
Stephen Hines
96e11e9ea6
am 67eab1e9: am c8a4b11e: Merge "Fix a race condition during Context init/teardown." into honeycomb-mr1
...
* commit '67eab1e9cd9a7bfb1a32492cdaa6f52bf470e11d':
Fix a race condition during Context init/teardown.
2011-03-09 14:35:55 -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
Stephen Hines
67eab1e9cd
am c8a4b11e: Merge "Fix a race condition during Context init/teardown." into honeycomb-mr1
...
* commit 'c8a4b11e1f752b901610472039f981f97a65aae6':
Fix a race condition during Context init/teardown.
2011-03-09 14:32:44 -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
Stephen Hines
c8a4b11e1f
Merge "Fix a race condition during Context init/teardown." into honeycomb-mr1
2011-03-09 14:29:57 -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
Huahui Wu
166b190efc
Merge "b/3307761 Clean up the flag mIsHandlingMultiTouch." into honeycomb-mr1
2011-03-09 13:55:35 -08:00
Andreas Huber
db7dc9cc89
Use the same http proxy mechanism that webkit uses instead of bypassing proxies.
...
Change-Id: Ifd64664d3052fbfa715c2920984170c2a6190f6b
related-to-bug: 3440271
2011-03-09 13:36:15 -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
Ed Heyl
b22bb1dae1
Merge "UsbManager: Fix broken Javadoc links" into honeycomb-mr1
2011-03-09 12:53:38 -08:00
Mike Lockwood
980f0430c1
UsbManager: Fix broken Javadoc links
...
Change-Id: Ia8ec7b29a7532feb00a28d6d325c129a9e041d2b
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-09 15:49:13 -05:00
Eric Laurent
18632db49a
am 2dc78477: am cc34967f: Merge "Fix issue 3439872: video chat and bluetooth SCO" into honeycomb-mr1
...
* commit '2dc78477364bd4accb9a603baaafca9a5523dcec':
Fix issue 3439872: video chat and bluetooth SCO
2011-03-09 11:00:22 -08:00
Eric Laurent
2dc7847736
am cc34967f: Merge "Fix issue 3439872: video chat and bluetooth SCO" into honeycomb-mr1
...
* commit 'cc34967fdcbf64826a068901d6fb1bd8bb1fa99f':
Fix issue 3439872: video chat and bluetooth SCO
2011-03-09 10:57:49 -08:00
Eric Laurent
cc34967fdc
Merge "Fix issue 3439872: video chat and bluetooth SCO" into honeycomb-mr1
2011-03-09 10:56:01 -08:00
Shimeng (Simon) Wang
2598bf600c
am 246b2b31: am 12c37caf: Merge "Consider mInitialScale when setting min zoom scale." into honeycomb-mr1
...
* commit '246b2b313cb545da9d6f791b90d5a1cc4316114e':
Consider mInitialScale when setting min zoom scale.
2011-03-09 10:53:44 -08:00
Shimeng (Simon) Wang
246b2b313c
am 12c37caf: Merge "Consider mInitialScale when setting min zoom scale." into honeycomb-mr1
...
* commit '12c37cafe184d5a6ac2a7a097c2fc616e5c1a6c8':
Consider mInitialScale when setting min zoom scale.
2011-03-09 10:51:26 -08:00
Mike Lockwood
e18a4067e0
am 094c9900: am 2c3ed826: Merge "Change UsbManager.requestPermission to only grant permission temporarily" into honeycomb-mr1
...
* commit '094c9900de383f0934f74cedef0d24b6d8a14905':
Change UsbManager.requestPermission to only grant permission temporarily
2011-03-09 10:51:16 -08:00
Shimeng (Simon) Wang
12c37cafe1
Merge "Consider mInitialScale when setting min zoom scale." into honeycomb-mr1
2011-03-09 10:48:57 -08:00
Mike Lockwood
094c9900de
am 2c3ed826: Merge "Change UsbManager.requestPermission to only grant permission temporarily" into honeycomb-mr1
...
* commit '2c3ed82600af117e791a087330a198fe90d298b7':
Change UsbManager.requestPermission to only grant permission temporarily
2011-03-09 10:48:13 -08:00
Mike Lockwood
2c3ed82600
Merge "Change UsbManager.requestPermission to only grant permission temporarily" into honeycomb-mr1
2011-03-09 10:44:19 -08:00
Robert Ly
2a36cf42fa
doc change: removing references to eclipse 3.4
...
Change-Id: Iac1885a252266e7b15169588b91385cadf41295b
2011-03-09 10:39:26 -08:00
Andreas Huber
f9f6087915
Merge "An HTTP datasource for stagefright using the chromium code."
2011-03-09 10:37:20 -08:00
Jean-Michel Trivi
0984ba25db
am 8d0e2b98: am 5fa7aac8: Merge "Fix bug 4064086 Use a death handler on audio focus changes from mode" into honeycomb-mr1
...
* commit '8d0e2b9857e5f77ced233dc408a7acd9e8ab2e8c':
Fix bug 4064086 Use a death handler on audio focus changes from mode
2011-03-09 10:22:56 -08:00
Jean-Michel Trivi
8d0e2b9857
am 5fa7aac8: Merge "Fix bug 4064086 Use a death handler on audio focus changes from mode" into honeycomb-mr1
...
* commit '5fa7aac81b471557cd944f762340281e5fa012f9':
Fix bug 4064086 Use a death handler on audio focus changes from mode
2011-03-09 10:20:24 -08:00
Jean-Michel Trivi
5fa7aac81b
Merge "Fix bug 4064086 Use a death handler on audio focus changes from mode" into honeycomb-mr1
2011-03-09 10:18:31 -08:00
Andreas Huber
5f5719e45b
An HTTP datasource for stagefright using the chromium code.
...
Use of this new datasource is now the default unless overwritten by
adb shell setprop media.stagefright.use-chromium false
Change-Id: I156a8eb9a1fff1cb537b4aec6cf3e8e6052be81e
2011-03-09 10:14:46 -08:00
David Li
82910e7db5
Merge "Added screenshot after glDraw* option to GLES2 Debugger"
2011-03-09 10:05:38 -08:00
David Li
717cd2e0e6
Merge "Initial commit of GLESv2 debugger server"
2011-03-09 10:04:46 -08:00
Wink Saville
f5bf454d01
Merge "Telephony: Corrections to LTE and eHRPD constant values."
2011-03-09 09:48:05 -08:00
Irfan Sheriff
eddeecf059
am 86587185: am 7ad85eb6: Merge "Persist wifi override in airplane mode" into honeycomb-mr1
...
* commit '865871850bcedd4b9da0536c8b41f3c1816e5f43':
Persist wifi override in airplane mode
2011-03-09 09:36:40 -08:00
Mike Lockwood
c6f23e8521
Change UsbManager.requestPermission to only grant permission temporarily
...
If the user approves an application to access a USB device or accessory
without choosing it as the default application, then permission is granted
only until the device or accessory is disconnected.
Only applications chosen as the default choice have permissions assigned persistently.
BUG: 4061035
Change-Id: Ic4f6271a91b2fc56bbeef82c579e26d88c63ae56
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-09 12:33:00 -05:00
Irfan Sheriff
865871850b
am 7ad85eb6: Merge "Persist wifi override in airplane mode" into honeycomb-mr1
...
* commit '7ad85eb62f9f332cc8002ec996cd359333ba590e':
Persist wifi override in airplane mode
2011-03-09 09:32:55 -08:00
Irfan Sheriff
7ad85eb62f
Merge "Persist wifi override in airplane mode" into honeycomb-mr1
2011-03-09 09:30:28 -08:00
Huahui Wu
9386a24eb1
b/3307761 Clean up the flag mIsHandlingMultiTouch.
...
The flag mIsHandlingMultiTouch was used to remove the out of order
touchMove events. After the fix b/3307761, it is no more needed.
Change-Id: I4d03131e2a22c53cc79c4105e39f078f1bea88ca
2011-03-09 09:26:36 -08:00
Patrick Scott
888f0654fd
am 5d534f28: am ea44c7c7: Merge "Pass the auto login header information to the app." into honeycomb-mr1
...
* commit '5d534f288d0c29337458e267fd207236bc23fec5':
Pass the auto login header information to the app.
2011-03-09 05:10:34 -08:00
Patrick Scott
5d534f288d
am ea44c7c7: Merge "Pass the auto login header information to the app." into honeycomb-mr1
...
* commit 'ea44c7c71431adbce348cf9ef3f22d9561bb7fc1':
Pass the auto login header information to the app.
2011-03-09 05:08:15 -08:00