46591 Commits

Author SHA1 Message Date
Mike Lockwood
9fffd9a8bb Merge "USB: minor cleanup work" into honeycomb-mr1 2011-03-11 17:52:36 -08:00
Adam Powell
87584f51a8 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
7647091436 Merge "Bug 3515073 Add ANativeWindow_fromSurfaceTexture" into honeycomb-mr1 2011-03-11 16:31:55 -08:00
Mike Lockwood
62cfeeb821 USB: minor cleanup work
Bug: 4067029

Change-Id: Icd8f912ab8732b5f770a217b9b3731092597ce02
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-11 18:51:29 -05:00
Nicolas Roard
f0230cca19 Merge "HTML5 Video improvements" into honeycomb-mr1 2011-03-11 14:35:32 -08:00
Nicolas Roard
0e778a1ab0 HTML5 Video improvements
- add support for the fullscreen button

counterpart webkit CL: https://android-git.corp.google.com/g/#change,101484

bug:2126902
Change-Id: Ibcc8c5b115089ad1f30ebe76e4d5c31b2d6389f9
2011-03-11 14:29:05 -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
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
Adam Powell
c37308f116 Fix bug 4083825 - Gesture zoom locked along content edges under some
circumstances

Tune the procedure used to handle "zoom slop" during a webview
pan+zoom gesture.

Change-Id: Ia706722ba6a46e64cce8814d4668e3857b16e562
2011-03-11 11:44:08 -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
9856fbd404 Merge "Broaden the filter for wallpaper restore" into honeycomb-mr1 2011-03-11 10:45:17 -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
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
364903bac6 Merge "Support for USB accessory URIs" into honeycomb-mr1 2011-03-11 05:56:50 -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
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
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
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
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
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
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
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
2fc7976399 Merge "Inline HTML5 Video support" into honeycomb-mr1 2011-03-10 17:10:29 -08:00
Adam Powell
cf63b66cfd Merge "Fix bug 4080407 - Browser stuck after scrolling- page stops responding" into honeycomb-mr1 2011-03-10 17:06:11 -08:00
Dianne Hackborn
cb44d96173 Fix issue #4084124: Wingray Often see black screen after market ANR due to 4084121
Need to resume the top activity after force removing a crashing
app's activities.

Change-Id: Id3384b2aa73039a9b1e72c2201d3ab0ef5b4f61f
2011-03-10 17:02:27 -08:00
Teng-Hui Zhu
661e8b1f21 Inline HTML5 Video support
Use the HTML5VideoView to make inline HTML5 video possible.
Full screen support will be the next step.

The native side change is at 101310.

bug:3506407, 2126902
Change-Id: I012f33a4d0c7b83d37b184fceb3923e1fb277b80
2011-03-10 16:58:24 -08:00
Adam Powell
80615b0075 Fix bug 4080407 - Browser stuck after scrolling- page stops responding
Account for gaps in touch queue sequence numbering when we flush out
canceled events from webcore's queue. Add a 2-second timeout to auto-flush
old events when a new gesture begins.

Change-Id: I764a7fcd673b3afb629055b001e9346f5b959dba
2011-03-10 16:45:12 -08:00
Jamie Gennis
f72606ce3e 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
dc8b70cabc 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
dd7617b327 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
cf994cc57d Merge "resolved conflicts for merge of 16cbe575 to honeycomb-mr1" into honeycomb-mr1 2011-03-10 15:29:12 -08:00
Mathias Agopian
8d94d82a6d fix [4025681] continuous sensors should not try to send an event as soon as they're activated
Make sure to send an event down only for sensors that report a value only on data
change. Other sensors, will naturally send an event when the next event is available.

Bug: 4025681
Change-Id: I6d444deda388b6bc9a33e3371e09d390f1566ec5
2011-03-10 15:23:28 -08:00
Scott Main
c411b4ec34 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
0722cec0f1 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