Christopher Tate
96b60ba644
Merge "Add a test app: quota exceeded doing a backup" into honeycomb-mr1
2011-03-11 18:22:37 -08:00
Dianne Hackborn
884c4106e2
Merge "Fix issues #4087362 and #4087356 " into honeycomb-mr1
2011-03-11 18:01:47 -08:00
Mike Lockwood
103a217104
Merge "USB: minor cleanup work" into honeycomb-mr1
2011-03-11 17:52:36 -08:00
Adam Powell
ba23ee2d57
Merge "Fix bug 4083825 - Gesture zoom locked along content edges under some circumstances" into honeycomb-mr1
2011-03-11 16:39:42 -08:00
Glenn Kasten
9f669c5391
Merge "Bug 3515073 Add ANativeWindow_fromSurfaceTexture" into honeycomb-mr1
2011-03-11 16:31:55 -08:00
Nicolas Roard
52d2b87932
Merge "HTML5 Video improvements" into honeycomb-mr1
2011-03-11 14:35:32 -08:00
Mike Lockwood
fd30a36d99
Merge "Clear default for USB device/accessory when new matching app is installed" into honeycomb-mr1
2011-03-11 13:24:01 -08:00
Joe Malin
6cc95a9743
am 9f187296: Merge "DOC CHANGE: Fix 4084450 monkeyrunner_concepts" into honeycomb
...
* commit '9f18729676a58cdfcee98db3329de3397c657d48':
DOC CHANGE: Fix 4084450 monkeyrunner_concepts
2011-03-11 13:10:29 -08:00
Joe Malin
447b17ba91
Merge "DOC CHANGE: Fix 4084450 monkeyrunner_concepts" into honeycomb
2011-03-11 13:08:59 -08:00
Mike Lockwood
e195b4bc54
Merge changes Ib63ab95a,I585b0610,Ia84da0b5 into honeycomb-mr1
...
* changes:
UsbManager: Hide APIs not needed for USB host or accessory support.
Remove MtpClient class from framework and public API
UsbDevice: Move IO related methods to new UsbDeviceConnection class
2011-03-11 10:57:06 -08:00
Christopher Tate
6fc20b07d7
Merge "Broaden the filter for wallpaper restore" into honeycomb-mr1
2011-03-11 10:45:17 -08:00
Dianne Hackborn
1f8c98d091
Merge "Fix issue #4084124 : Wingray Often see black screen after market ANR due to 4084121" into honeycomb-mr1
2011-03-11 10:39:46 -08:00
Dianne Hackborn
3a9c0a05bb
Merge "Fix issue #4081756 : Crash when un-stopping applications" into honeycomb-mr1
2011-03-11 10:38:52 -08:00
Glenn Kasten
2ee08a1694
Merge "Bug 3012968 DRM output control" into honeycomb-mr1
2011-03-11 08:43:05 -08:00
Mike Lockwood
1fc8136de0
Merge "Support for USB accessory URIs" into honeycomb-mr1
2011-03-11 05:56:50 -08:00
Jim Miller
21daa912d8
Merge "Fix 3201849: Enable hardware acceleration in LockScreen WaveView [DO NOT MERGE]" into honeycomb-mr1
2011-03-10 22:59:57 -08:00
Justin Ho
d295c2701c
Merge "Updated cellular data indicators with transmission signals AGAIN Bug: #6699FF" into honeycomb-mr1
2011-03-10 22:31:29 -08:00
Justin Ho
bce08aed25
Merge "Wire up the data activity reporting on wifi icon in status bar." into honeycomb-mr1
2011-03-10 22:22:57 -08:00
Adam Powell
c59d880b61
Merge "Fix bug 4082512 IAE "pointerIndex out of range" while zooming over flashplayer in browser" into honeycomb-mr1
2011-03-10 21:40:38 -08:00
Justin Ho
23fc9022d7
Merge "Updated cellular data indicators with transmission signals Bug: #6699FF" into honeycomb-mr1
2011-03-10 21:39:24 -08:00
Huahui Wu
df328a2e04
Merge "b/4080388 Improving the performance of ZoomManager" into honeycomb-mr1
2011-03-10 21:25:47 -08:00
Ken Sumrall
45d6471556
Merge "Teach the framework to use the new android_reboot() function." into honeycomb-mr1
2011-03-10 19:24:42 -08:00
Jamie Gennis
c2cc1b3f97
Merge "SurfaceFlinger: Respect the PROTECTED gralloc bit." into honeycomb-mr1
2011-03-10 18:06:32 -08:00
Mathias Agopian
069160eba0
Merge "fix [4025681] continuous sensors should not try to send an event as soon as they're activated" into honeycomb-mr1
2011-03-10 17:36:15 -08:00
Teng-Hui Zhu
40ce089c12
Merge "Inline HTML5 Video support" into honeycomb-mr1
2011-03-10 17:10:29 -08:00
Adam Powell
672f2f2b66
Merge "Fix bug 4080407 - Browser stuck after scrolling- page stops responding" into honeycomb-mr1
2011-03-10 17:06:11 -08:00
Jamie Gennis
7a4d0dfd43
SurfaceFlinger: Respect the PROTECTED gralloc bit.
...
This change makes SurfaceFlinger treat layers for which the active
buffer has the GRALLOC_USAGE_PROTECTED bit set as if they have the
'secure' flag set.
Change-Id: Ic60b6513a63e4bb92ec6ce9fd12fd39b4ba5f674
Bug: 4081304
2011-03-10 16:25:48 -08:00
Scott Main
3b4f8b2ca5
am c411b4ec: Merge "docs: fix misc doc bugs bug: 3295540 bug: 3319686 bug: 3337541 bug: 3355640 bug: 3483758" into honeycomb
...
* commit 'c411b4ec343406a34db6f53e8a0f7ee9aa417c0d':
docs: fix misc doc bugs bug: 3295540 bug: 3319686 bug: 3337541 bug: 3355640 bug: 3483758
2011-03-10 15:40:32 -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
e3fd9b8044
Merge "docs: fix misc doc bugs bug: 3295540 bug: 3319686 bug: 3337541 bug: 3355640 bug: 3483758" into honeycomb
2011-03-10 15:17:42 -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
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
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
5600135d77
Merge "New textfield search assets Bug: 3321263" into honeycomb-mr1
2011-03-10 13:53:48 -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
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
14c2c61a31
Merge "UsbAccessory: Add URI string, replace type string with description" into honeycomb-mr1
2011-03-10 07:50:30 -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
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
a7cdea8471
Merge "Fix issue #4066157 : ActivityManager.getMemoryClass() returning large memory class" into honeycomb-mr1
2011-03-09 18:00:10 -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
Joe Malin
3d9f7dcebd
Merge "DOC CHANGE: Add IntelliJ to Dev Guide" into honeycomb
2011-03-09 16:58:29 -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
Wei-Ta Chen
a9d8122bb6
Merge "Fix 3510563: memory leak in BitmapRegionDecoder." into honeycomb-mr1
2011-03-09 16:21:53 -08:00