Mike Lockwood
7e6f519c07
am 14c875ea: Merge "Clear default for USB device/accessory when new matching app is installed" into honeycomb-mr1
...
* commit '14c875eac750ca096de439225b1a028b1facc58e':
Clear default for USB device/accessory when new matching app is installed
2011-03-11 13:26:14 -08:00
Mike Lockwood
14c875eac7
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
236d41c732
am 761b8440: am 9f187296: Merge "DOC CHANGE: Fix 4084450 monkeyrunner_concepts" into honeycomb
...
* commit '761b84409135641ec27bb828dbd8a1d04a7252fe':
DOC CHANGE: Fix 4084450 monkeyrunner_concepts
2011-03-11 13:12:37 -08:00
Mike Lockwood
c7d32d1065
Clear default for USB device/accessory when new matching app is installed
...
Bug: 4063041
Change-Id: Ia1b4f29d3e54ec21aa64407720d9d5db62855380
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-11 16:12:07 -05:00
Joe Malin
761b844091
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
9f18729676
Merge "DOC CHANGE: Fix 4084450 monkeyrunner_concepts" into honeycomb
2011-03-11 13:08:59 -08:00
Mike Lockwood
75c95e9a6d
am 0eb7b697: Merge changes Ib63ab95a,I585b0610,Ia84da0b5 into honeycomb-mr1
...
* commit '0eb7b697b7c180660647b5cd0cd7dd067f6b6abb':
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 11:37:14 -08:00
Mike Lockwood
0eb7b697b7
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
ab1f2a824b
am 9856fbd4: Merge "Broaden the filter for wallpaper restore" into honeycomb-mr1
...
* commit '9856fbd40470c9f441b6c38b980210cfdef821e9':
Broaden the filter for wallpaper restore
2011-03-11 10:48:46 -08:00
Christopher Tate
9856fbd404
Merge "Broaden the filter for wallpaper restore" into honeycomb-mr1
2011-03-11 10:45:17 -08:00
Dianne Hackborn
8657427f78
am 7b076307: Merge "Fix issue #4084124 : Wingray Often see black screen after market ANR due to 4084121" into honeycomb-mr1
...
* commit '7b076307bb1f78d3f5616b7f2f2ad496aa4a33d7':
Fix issue #4084124 : Wingray Often see black screen after market ANR due to 4084121
2011-03-11 10:44:46 -08:00
Dianne Hackborn
1bada408f9
am 492eb33d: Merge "Fix issue #4081756 : Crash when un-stopping applications" into honeycomb-mr1
...
* commit '492eb33d549afa65e630d2f4886b1bdf3d979d04':
Fix issue #4081756 : Crash when un-stopping applications
2011-03-11 10:44:42 -08:00
Dianne Hackborn
7b076307bb
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
492eb33d54
Merge "Fix issue #4081756 : Crash when un-stopping applications" into honeycomb-mr1
2011-03-11 10:38:52 -08:00
Glenn Kasten
055066e1e7
am 92f2f3ff: Merge "Bug 3012968 DRM output control" into honeycomb-mr1
...
* commit '92f2f3ff2ea5c5b474722f2055cfee4916010e26':
Bug 3012968 DRM output control
2011-03-11 08:44:35 -08:00
Glenn Kasten
92f2f3ff2e
Merge "Bug 3012968 DRM output control" into honeycomb-mr1
2011-03-11 08:43:05 -08:00
Mike Lockwood
a75075e167
UsbManager: Hide APIs not needed for USB host or accessory support.
...
Bug: 4067029
Change-Id: Ib63ab95a6571d6a691834bfb583a68d2e4cfd22e
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-11 11:26:38 -05:00
Mike Lockwood
c72eb9113a
Remove MtpClient class from framework and public API
...
After reviewing this class I decided it would be best not to include it in the public API
since it adds no functionality that cannot be done using MtpDevice and other APIs directly.
So I am moving it to the CameraBrowser sample instead.
Also changed CameraBrowser to build against the SDK to ensure all the necessary APIs for
PTP support have been made public.
Bug: 4067029
Change-Id: I585b06104084953176d018ced08bba0cb4607490
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-11 10:55:44 -05:00
Mike Lockwood
acc29cc91b
UsbDevice: Move IO related methods to new UsbDeviceConnection class
...
UsbDevice is now just an immutable parcelable object like UsbInterface and
UsbEndpoint.
All IO related functionality is now contained in UsbDeviceConnection
and UsbRequest.
Bug: 4067029
Change-Id: Ia84da0b512a697acc940eee0c3566711c62e1a68
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-11 10:24:21 -05:00
Mike Lockwood
4135cb8e43
am 364903ba: Merge "Support for USB accessory URIs" into honeycomb-mr1
...
* commit '364903bac6b9bfde694f1c0c5c40b6a2af628408':
Support for USB accessory URIs
2011-03-11 06:02:57 -08:00
Mike Lockwood
364903bac6
Merge "Support for USB accessory URIs" into honeycomb-mr1
2011-03-11 05:56:50 -08:00
Jim Miller
7b7a8ca615
am 352987e0: Merge "Fix 3201849: Enable hardware acceleration in LockScreen WaveView [DO NOT MERGE]" into honeycomb-mr1
...
* commit '352987e0889b6fa8862f489bc31ba7e9de8d1cbe':
Fix 3201849: Enable hardware acceleration in LockScreen WaveView [DO NOT MERGE]
2011-03-10 23:01:42 -08:00
Jim Miller
352987e088
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
f5c2d35059
am f1093dfd: Merge "Updated cellular data indicators with transmission signals AGAIN Bug: #6699FF" into honeycomb-mr1
...
* commit 'f1093dfd7b15c7f33341a4062987c906c061d65f':
Updated cellular data indicators with transmission signals AGAIN Bug: #6699FF
2011-03-10 22:33:43 -08:00
Justin Ho
f1093dfd7b
Merge "Updated cellular data indicators with transmission signals AGAIN Bug: #6699FF" into honeycomb-mr1
2011-03-10 22:31:29 -08:00
Justin Ho
48a412bded
Updated cellular data indicators with transmission signals AGAIN
...
Bug: #6699FF
Change-Id: Idfc1c43e3fb2df12665bcc3ea18ae7b9f6dfbe9e
2011-03-10 22:26:34 -08:00
Justin Ho
cf99638b6b
am 57162cdc: Merge "Wire up the data activity reporting on wifi icon in status bar." into honeycomb-mr1
...
* commit '57162cdcdeaacc826011f98d0285c6034797f5f3':
Wire up the data activity reporting on wifi icon in status bar.
2011-03-10 22:24:51 -08:00
Justin Ho
57162cdcde
Merge "Wire up the data activity reporting on wifi icon in status bar." into honeycomb-mr1
2011-03-10 22:22:57 -08:00
Joe Onorato
f32621aded
Wire up the data activity reporting on wifi icon in status bar.
...
Bug: 3412258 and #6699FF
Change-Id: I11142f1cd5a2a60045b2a1fea371b2ead2aa81b4
2011-03-10 22:21:50 -08:00
Adam Powell
2737dfe0a5
am 5ec35c17: Merge "Fix bug 4082512 IAE "pointerIndex out of range" while zooming over flashplayer in browser" into honeycomb-mr1
...
* commit '5ec35c172ad0628b7092ab34f962ff2c063905d8':
Fix bug 4082512 IAE "pointerIndex out of range" while zooming over flashplayer in browser
2011-03-10 21:43:45 -08:00
Justin Ho
f333baa015
am dacf0d02: Merge "Updated cellular data indicators with transmission signals Bug: #6699FF" into honeycomb-mr1
...
* commit 'dacf0d022f1f78e60fffcd8b6b547743cca51c76':
Updated cellular data indicators with transmission signals Bug: #6699FF
2011-03-10 21:41:53 -08:00
Adam Powell
5ec35c172a
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
dacf0d022f
Merge "Updated cellular data indicators with transmission signals Bug: #6699FF" into honeycomb-mr1
2011-03-10 21:39:24 -08:00
Justin Ho
f269fe3b22
Updated cellular data indicators with transmission signals
...
Bug: #6699FF
Change-Id: I86a4d31f24112daeb20f9edd3f06a1eb0ff4c846
2011-03-10 21:37:18 -08:00
Huahui Wu
372161b755
am 769e132a: Merge "b/4080388 Improving the performance of ZoomManager" into honeycomb-mr1
...
* commit '769e132ae30b6615353dd6bd7d8779b6ef1b0b31':
b/4080388 Improving the performance of ZoomManager
2011-03-10 21:27:24 -08:00
Huahui Wu
769e132ae3
Merge "b/4080388 Improving the performance of ZoomManager" into honeycomb-mr1
2011-03-10 21:25:47 -08:00
Adam Powell
8f626a1917
Fix bug 4082512 IAE "pointerIndex out of range" while zooming over
...
flashplayer in browser
Fix an issue where gestures weren't being fully canceled by webkit to
the multitouch detector. This will prevent ScaleGestureDetector from
attempting to resume its regularly scheduled gesture already in
progress.
Change-Id: Id4881eeb1df8414dfa23174481bd7dc70fd08fee
2011-03-10 21:20:07 -08:00
Ken Sumrall
9246e4edba
am c7fcc507: Merge "Teach the framework to use the new android_reboot() function." into honeycomb-mr1
...
* commit 'c7fcc5076fb2988fba699a2167d19475fd58ed0b':
Teach the framework to use the new android_reboot() function.
2011-03-10 19:27:05 -08:00
Ken Sumrall
c7fcc5076f
Merge "Teach the framework to use the new android_reboot() function." into honeycomb-mr1
2011-03-10 19:24:42 -08:00
Glenn Kasten
b8763f60b4
Bug 3012968 DRM output control
...
Modifies Stagefright to verify that there is a hardware-protected path
to video sink for DRM content.
Change-Id: I18b8741390e803a05a88c7f180b860a24ba88a10
2011-03-10 19:16:40 -08:00
Joe Malin
15ffcc6206
DOC CHANGE: Fix 4084450 monkeyrunner_concepts
...
Change-Id: Iedc64816032222b46a52680287e21ff455909153
2011-03-10 18:09:03 -08:00
Jamie Gennis
34bb677f3f
am b2e606f5: Merge "SurfaceFlinger: Respect the PROTECTED gralloc bit." into honeycomb-mr1
...
* commit 'b2e606f5f175906ab8c578cb9ba03c728154c50c':
SurfaceFlinger: Respect the PROTECTED gralloc bit.
2011-03-10 18:07:57 -08:00
Jamie Gennis
b2e606f5f1
Merge "SurfaceFlinger: Respect the PROTECTED gralloc bit." into honeycomb-mr1
2011-03-10 18:06:32 -08:00
Christopher Tate
9b95a4fcdc
Broaden the filter for wallpaper restore
...
Tweak the filter parameters so that we now use any restored wallpaper image
that is larger than our ideal size, and will reject any smaller images only
if they are *much* smaller than our ideal size. The specific threshold used
here will just barely reject Nexus One or Droid sized wallpapers for restore
onto a Xoom, but will pass anything larger.
Bug 4070129
Change-Id: I889bdb3ef5011343b2fccb2f81c6abc2f4603ee2
2011-03-10 17:53:53 -08:00
Huahui Wu
31484fbe28
b/4080388 Improving the performance of ZoomManager
...
This is a re-factor of cl b/3307761.
It uses an circular array to implement the queue instead of linked list.
And it saves the time to convert float to Float.
Change-Id: I1076aabec2310b2cc299d7f485bf9c4710107045
2011-03-10 17:48:38 -08:00
Mathias Agopian
92b56b8c5b
am e90c4998: Merge "fix [4025681] continuous sensors should not try to send an event as soon as they\'re activated" into honeycomb-mr1
...
* commit 'e90c4998b514f738b3655e55b51a38119b8c5f23':
fix [4025681] continuous sensors should not try to send an event as soon as they're activated
2011-03-10 17:37:47 -08:00
Mathias Agopian
e90c4998b5
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
Jim Miller
1b365921e8
Fix 3201849: Enable hardware acceleration in LockScreen WaveView [DO NOT MERGE]
...
Change-Id: I07bbed7843857158cd2c1ffd9b184bde7fd5860d
2011-03-10 17:20:21 -08:00
Teng-Hui Zhu
37ee248b52
am 2fc79763: Merge "Inline HTML5 Video support" into honeycomb-mr1
...
* commit '2fc7976399e5f0f4c6e1dae528df727e7dcbdc8e':
Inline HTML5 Video support
2011-03-10 17:13:03 -08:00
Teng-Hui Zhu
2fc7976399
Merge "Inline HTML5 Video support" into honeycomb-mr1
2011-03-10 17:10:29 -08:00