40713 Commits

Author SHA1 Message Date
Ben Murdoch
f80526d772 am 6e710b4f: Merge "Maintain the seek position in HTML5 video" into honeycomb
* commit '6e710b4feb634f9e39c11ca1433d947bc1baab80':
  Maintain the seek position in HTML5 video
2011-01-19 07:38:24 -08:00
Ben Murdoch
6e710b4feb Merge "Maintain the seek position in HTML5 video" into honeycomb 2011-01-19 07:34:49 -08:00
Leon Scroggins
5d3175e704 am 40777239: Make WebView inactive when title bar takes focus.
* commit '407772390f4a1b4e1196820ea22b9327eea54019':
  Make WebView inactive when title bar takes focus.
2011-01-19 06:44:10 -08:00
Leon Scroggins
407772390f Make WebView inactive when title bar takes focus.
Bug:3296938
Change-Id: I656e8582044acf3b0e9b417f41337833fe72c181
2011-01-19 09:41:06 -05:00
Ben Murdoch
ff19d19e01 Maintain the seek position in HTML5 video
Receive the current seek position from native when we start
playing a video. That way is we are returning from pause we correctly
continue where we left off.

Requires and external/webkit change.
(I6001f45a362f491e9040c8b52260d0a08fb8504f)

Bug:3303721
Change-Id: I6b92289d4ef36bba1e0429327917533a4101655d
2011-01-19 11:48:15 +00:00
Shih-wei Liao
388023a1e9 am b25de055: Merge "1. fp_mad.rs: Pass C99 check. 2. Include C99 header (Will be fixed later at build.git.)" into honeycomb
* commit 'b25de0558c4e5440982db53a220943a899390c90':
  1. fp_mad.rs: Pass C99 check. 2. Include C99 header (Will be fixed later at build.git.)
2011-01-19 02:25:25 -08:00
Shih-wei Liao
b25de0558c Merge "1. fp_mad.rs: Pass C99 check. 2. Include C99 header (Will be fixed later at build.git.)" into honeycomb 2011-01-19 02:23:01 -08:00
Shih-wei Liao
1ad9612e99 1. fp_mad.rs: Pass C99 check.
2. Include C99 header (Will be fixed later at build.git.)

Change-Id: I2864e081b2635dfc4fc0c85f746f6d0ce0b01af5
2011-01-19 02:18:45 -08:00
Winson Chung
adce48ccba am 7f447de2: Merge "Disabling queued unbinding of RemoteViewsServices until we fix flashing in widgets." into honeycomb
* commit '7f447de2f511ec8ee35af8abf0ca3c46ffa68289':
  Disabling queued unbinding of RemoteViewsServices until we fix flashing in widgets.
2011-01-19 01:00:36 -08:00
Winson Chung
7f447de2f5 Merge "Disabling queued unbinding of RemoteViewsServices until we fix flashing in widgets." into honeycomb 2011-01-19 00:58:38 -08:00
Winson Chung
32cf193412 Disabling queued unbinding of RemoteViewsServices until we fix flashing in widgets.
Change-Id: Iee53d4930dc4007df4298a282cdd5101876215a1
2011-01-19 00:52:34 -08:00
Winson Chung
caedec768b am aac19783: Merge "Refactoring app widgets to address security/performance issues." into honeycomb
* commit 'aac197833f3b2deddc6b3da5c144be36721d9547':
  Refactoring app widgets to address security/performance issues.
2011-01-18 23:05:38 -08:00
Winson Chung
aac197833f Merge "Refactoring app widgets to address security/performance issues." into honeycomb 2011-01-18 23:04:01 -08:00
Winson Chung
81f39eb6e7 Refactoring app widgets to address security/performance issues.
- Moving the service binding to AppWidgetService to prevent arbitrary apps from binding to widget services
- Requiring RemoteViewsServices to require android.permission.BIND_REMOTEVIEWS permission

Change-Id: Id135bafba998299eb278067712b8a5d8487cfd04
2011-01-18 22:57:09 -08:00
Shih-wei Liao
888a0c94e8 am 9d30f754: Merge "Fix the build." into honeycomb
* commit '9d30f75468b143724238e2cf00fcc7a2eeb2ba3f':
  Fix the build.
2011-01-18 22:53:19 -08:00
Shih-wei Liao
9d30f75468 Merge "Fix the build." into honeycomb 2011-01-18 22:51:22 -08:00
Shih-wei Liao
cbb7279e7b Fix the build.
Change-Id: I23c4146cb19540351c33b5823df25d6e2b204402
2011-01-18 22:50:18 -08:00
Hung-ying Tyan
7eeecf10e5 am 9a07c990: Merge "Cherry-pick "Fix VPN notification helper" from master." into honeycomb
* commit '9a07c990d305243d1b9b8557fea96f273c46dc0f':
  Cherry-pick "Fix VPN notification helper" from master.
2011-01-18 22:41:18 -08:00
Hung-ying Tyan
9a07c990d3 Merge "Cherry-pick "Fix VPN notification helper" from master." into honeycomb 2011-01-18 22:39:20 -08:00
Hung-ying Tyan
f14491f696 Cherry-pick "Fix VPN notification helper" from master.
DO NOT MERGE

+ Show the ticker text only on the first time.
+ Keep static variables to avoid GC during connection.

Bug: 3292710
Change-Id: I8e97c792814404de0e36a2f9cc0022f41f723367
2011-01-19 14:36:22 +08:00
James Dong
456570ef55 am 5fb60c7a: Use metadata in video buffers for timelapse video recording by default to eliminate memcpy
* commit '5fb60c7af2cbf59a99ae324c4284c7860b37c723':
  Use metadata in video buffers for timelapse video recording by default to eliminate memcpy
2011-01-18 22:09:21 -08:00
James Dong
5fb60c7af2 Use metadata in video buffers for timelapse video recording by default to eliminate memcpy
bug - 3361771

Change-Id: Ib37ffe4be8edc8708baa76b3507b6f11372536d9
2011-01-18 21:33:58 -08:00
Jim Miller
60ad6f0ac0 am 3355e18f: Merge "Fix 3356338: Add recovery text to AccountUnlockScreen" into honeycomb
* commit '3355e18f68c5a8fce62e783fe370afaf0899d655':
  Fix 3356338: Add recovery text to AccountUnlockScreen
2011-01-18 21:17:04 -08:00
Jim Miller
3355e18f68 Merge "Fix 3356338: Add recovery text to AccountUnlockScreen" into honeycomb 2011-01-18 21:14:38 -08:00
Stephen Hines
dd8c9d68f9 am 688de88b: Fix bug in modf library function (plus typos).
* commit '688de88b65cdafc62a82a4eb2ff182fd320a0e51':
  Fix bug in modf library function (plus typos).
2011-01-18 21:07:50 -08:00
Stephen Hines
688de88b65 Fix bug in modf library function (plus typos).
Change-Id: I643c905e2e3e2dcf7a61f1d027b749d9a0d6e542
2011-01-18 21:04:59 -08:00
Adam Powell
dd4760a2cd am d63d3358: Merge "Fix bug 3362258 - Fastscroll is out of sync with the list" into honeycomb
* commit 'd63d33581051fdffd16789551852368d21b89fe1':
  Fix bug 3362258 - Fastscroll is out of sync with the list
2011-01-18 20:46:26 -08:00
Adam Powell
d63d335810 Merge "Fix bug 3362258 - Fastscroll is out of sync with the list" into honeycomb 2011-01-18 20:44:44 -08:00
Adam Powell
b1f498afc3 Fix bug 3362258 - Fastscroll is out of sync with the list
Change-Id: I13282bfed355f5794041e83818ee2e9e97c1b318
2011-01-18 20:44:01 -08:00
Mike Lockwood
6b280468f5 am 2bc6971d: Merge changes I7df1ff78,Ibc2e8adf into honeycomb
* commit '2bc6971dd82d37273b0baafeeebf3ba90d15837f':
  MediaScanner: Make sure name field is set for file based playlists
  MTP: Fix problem with MTP starting up on the first try.
2011-01-18 20:31:45 -08:00
Mike Lockwood
2bc6971dd8 Merge changes I7df1ff78,Ibc2e8adf into honeycomb
* changes:
  MediaScanner: Make sure name field is set for file based playlists
  MTP: Fix problem with MTP starting up on the first try.
2011-01-18 20:30:13 -08:00
Romain Guy
612ed43bc8 am 3cd030a4: Merge "Don\'t pass a null View to OnListItemClickListener. Bug #3365153" into honeycomb
* commit '3cd030a4fe229155b252cee003c78e2467ff4d82':
  Don't pass a null View to OnListItemClickListener. Bug #3365153
2011-01-18 20:29:30 -08:00
Mike Lockwood
242d0cdc1a MediaScanner: Make sure name field is set for file based playlists
Change-Id: I7df1ff783d815d6021ec2432467ba56cb3f3ad1b
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-18 20:29:08 -08:00
Romain Guy
3cd030a4fe Merge "Don't pass a null View to OnListItemClickListener. Bug #3365153" into honeycomb 2011-01-18 20:27:22 -08:00
Romain Guy
7890fe2da4 Don't pass a null View to OnListItemClickListener.
Bug #3365153

Change-Id: I1328a554408bf16ec592ae1a747e57a5fb9305e3
2011-01-18 20:24:18 -08:00
Mike Lockwood
a1c9180461 MTP: Fix problem with MTP starting up on the first try.
BUG: 3361230

Change-Id: Ibc2e8adf24a14ea18385b306e786a77983ff8f5b
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-18 20:11:29 -08:00
Dianne Hackborn
3023afefd4 Bee seeing you...
Change-Id: I023425e1752b91fed36e6b005b7b03816f779d9c
2011-01-18 22:56:42 -05:00
Irfan Sheriff
0c7e16450c Fix soft Ap handling on system restart
When system server restarts, a soft AP
start can fail. Fix it by doing a stop
and start through netd.

Bug: 3236625
Change-Id: I95f31eb34a03b64cb7e2b6b8bdd56fc2119b605b
2011-01-18 19:31:09 -08:00
Eric Rowe
85d5b532dd am f38bddbe: DO NOT MERGE Add connect HID/NAP BT stress test
* commit 'f38bddbeb42988c7960e20585aeee9ae64f4b985':
  DO NOT MERGE Add connect HID/NAP BT stress test
2011-01-18 19:08:42 -08:00
Eric Rowe
993add8297 am a0d4d80f: DO NOT MERGE Cleaned up BT test utils
* commit 'a0d4d80fd2feaa04cb5f5242acd159cd783b25d4':
  DO NOT MERGE Cleaned up BT test utils
2011-01-18 19:06:34 -08:00
Jeff Brown
fb75738ee2 Never drag scroll views with no children.
Fixes a regression from Froyo.  Previously, when a scroll view
had no children, its onTouchEvent would return because the scroll
view would only start dragging if the user touched one of its children.
In Gingerbread, the user can drag from anywhere within the scroll
view, not just by touching a child.  However, it makes no sense
to drag a scroll view that has no children so an empty scroll view
should just ignore touches like any other empty view group would.

This change fixes applications that for some reason or other happen
to have empty scroll views in strange places.

Bug: 3246230
Change-Id: Iada6e886e8363e6778f42fc4861de228512d8bed
2011-01-18 18:42:33 -08:00
Romain Guy
3e4f4b8857 am 064f6ad3: Merge "Recreate the EGL surface when ViewRoot\'s surface changes. Bug #3306150" into honeycomb
* commit '064f6ad3928c51996359694c00a580115b2dabfc':
  Recreate the EGL surface when ViewRoot's surface changes. Bug #3306150
2011-01-18 18:41:29 -08:00
Jason Sams
a11b2e8a34 am e70b445d: Merge "Correctly log debugging info as debug." into honeycomb
* commit 'e70b445d2fb128b831b84408f0c9f2b499918ced':
  Correctly log debugging info as debug.
2011-01-18 18:41:22 -08:00
Jason Sams
17cab460b1 am e6a97e27: Merge "Fix race condition between GC thread and the teardown of RS. The RS context was going away while the objects were being deleted within the finializer." into honeycomb
* commit 'e6a97e27bcc1b8320fbe09d7827aec8050ebef01':
  Fix race condition between GC thread and the teardown of RS.  The RS context was going away while the objects were being deleted within the finializer.
2011-01-18 18:41:14 -08:00
Jason Sams
752d2bf9a9 am 148594a0: Merge "Cleanup logs." into honeycomb
* commit '148594a0151ddf4978a9d796b5541cca3407fb89':
  Cleanup logs.
2011-01-18 18:41:04 -08:00
Guang Zhu
e97cc1a286 am c3db7c8f: Merge "further remove calls to runFinalization" into honeycomb
* commit 'c3db7c8f3bc9af38d0f4ad2c66ff696c115c036a':
  further remove calls to runFinalization
2011-01-18 18:40:55 -08:00
Adam Powell
6cd8a98d6e am 92375756: Merge "Fix bug 3362979 - Holo light overflow button has stale focused state" into honeycomb
* commit '923757567ec834c0a1e2c68f4951990046e6e3c1':
  Fix bug 3362979 - Holo light overflow button has stale focused state
2011-01-18 18:40:51 -08:00
Stephen Hines
5df7b84048 am 66934423: Merge "Provide mechanism to switch between extern/static." into honeycomb
* commit '66934423c8d398b7d0661bba6dba0ddcab2352e3':
  Provide mechanism to switch between extern/static.
2011-01-18 18:40:39 -08:00
Dianne Hackborn
a4605b72c2 am e6413270: Merge "Just a little \'ol activity manager permission change." into honeycomb
* commit 'e64132705279fea1769af3e5ef5c7384a2fef5d4':
  Just a little 'ol activity manager permission change.
2011-01-18 18:40:29 -08:00
Dianne Hackborn
fe86e9793c am 661b6cfb: Merge "Okay, new plan for dialogs." into honeycomb
* commit '661b6cfb2bcecdd335540db7059e5d8e22c2e79a':
  Okay, new plan for dialogs.
2011-01-18 18:40:22 -08:00