22106 Commits

Author SHA1 Message Date
Andrei Popescu
c4fbceb57b Make sure the onended event is dispatched even when
the user dismisses the video before it plays to completion.

Fix bug: 2533272

Change-Id: I73f216f4f416f5fdca0bbba2244b88666f8f6eac
2010-04-14 17:31:17 +01:00
Robert Greenwalt
22b3644ac2 Update the datause icons.
bug:2576057
Change-Id: Idf57d59aecb9bcff635dafa1e77d90a8737a0c08
2010-04-14 09:13:53 -07:00
Robert Greenwalt
9cb66e89cd Merge "Perist Throttle data across reboots" into froyo 2010-04-14 09:07:25 -07:00
James Dong
42d66573ff Use PV_PLAYER to handle RTSP streaming
bug - 2594865

Change-Id: Ice5b89b1d53bbc4da033892fe545bdf51ac7267f
2010-04-14 08:57:14 -07:00
Leon Scroggins
b2212464a3 Merge "Ensure the selection does not change in setTextAndKeepSelection." into froyo 2010-04-14 06:42:20 -07:00
Kristian Monsen
d503a1524a Merge "Fix for 2585858, load invalid urls." into froyo 2010-04-14 02:22:18 -07:00
Kristian Monsen
53c0c0daf4 Merge "Fix (again) for bug 2558156, update cache encoding correctly" into froyo 2010-04-14 02:22:05 -07:00
Grace Kloba
50004bcd4b Pass WebKit scrollbar mode to Java. When scrollbar
is alwaysOff, don't trigger scroll.

If there is no horizontal and vertical scrollbar,
don't trigger the zoom control neither.

Fix http://b/issue?id=2512549
2010-04-13 22:58:51 -07:00
Daniel Sandler
099fc362e2 Merge "Manually integrating froyo lockscreen fixes:" into kraken 2010-04-13 20:34:23 -07:00
Dianne Hackborn
baa0fd95cf am 7b16f95c: am 8e1f2f88: Merge "Fix issue #2555171: Switching to app immediately after unmounting..." into froyo
Merge commit '7b16f95cd293cedd2b9204428088ea3e2f8399e5' into kraken

* commit '7b16f95cd293cedd2b9204428088ea3e2f8399e5':
  Fix issue #2555171: Switching to app immediately after unmounting...
2010-04-13 18:21:45 -07:00
Dianne Hackborn
7b16f95cd2 am 8e1f2f88: Merge "Fix issue #2555171: Switching to app immediately after unmounting..." into froyo
Merge commit '8e1f2f8804a1f63c7a03a3eeced9ffdf6e6c3293' into froyo-plus-aosp

* commit '8e1f2f8804a1f63c7a03a3eeced9ffdf6e6c3293':
  Fix issue #2555171: Switching to app immediately after unmounting...
2010-04-13 18:10:35 -07:00
Dianne Hackborn
6d11272285 am cd616247: am ce73c1e5: Framework change for #2583442: Navigation dies when night mode changes
Merge commit 'cd616247db69bdae8ab781be1f1d646ac7abf755' into kraken

* commit 'cd616247db69bdae8ab781be1f1d646ac7abf755':
  Framework change for #2583442: Navigation dies when night mode changes
2010-04-13 18:08:17 -07:00
Dianne Hackborn
8e1f2f8804 Merge "Fix issue #2555171: Switching to app immediately after unmounting..." into froyo 2010-04-13 18:07:27 -07:00
Dianne Hackborn
cd616247db am ce73c1e5: Framework change for #2583442: Navigation dies when night mode changes
Merge commit 'ce73c1e5bfd36154d21ee7b332cfdc6cea48812e' into froyo-plus-aosp

* commit 'ce73c1e5bfd36154d21ee7b332cfdc6cea48812e':
  Framework change for #2583442: Navigation dies when night mode changes
2010-04-13 18:05:47 -07:00
Dianne Hackborn
b7d9e8e17b am fbd22f07: am ae8c2c71: Merge "Fix issue #2420340: if FLAG_SHOW_WHEN_LOCKED, do not show keyguard..." into froyo
Merge commit 'fbd22f072b48be4b465085fb5354890e2f10fd32' into kraken

* commit 'fbd22f072b48be4b465085fb5354890e2f10fd32':
  Fix issue #2420340: if FLAG_SHOW_WHEN_LOCKED, do not show keyguard...
2010-04-13 18:02:11 -07:00
Dianne Hackborn
ce73c1e5bf Framework change for #2583442: Navigation dies when night mode changes
The window manager doesn't retain its keep screen on lock while
in the process of destroying and creating new activity windows during
a config change.  Now it does.

Unfortunately, this doesn't help maps, since it doesn't use our
lovely KEEP_SCREEN_ON flag. :p

Change-Id: Ida4bc0fcfe132cdff2bd4eeb7ba0ce9731504d14
2010-04-13 18:01:40 -07:00
Dianne Hackborn
fbd22f072b am ae8c2c71: Merge "Fix issue #2420340: if FLAG_SHOW_WHEN_LOCKED, do not show keyguard..." into froyo
Merge commit 'ae8c2c71f7791ed0321e56f31f0c1276da4d8842' into froyo-plus-aosp

* commit 'ae8c2c71f7791ed0321e56f31f0c1276da4d8842':
  Fix issue #2420340: if FLAG_SHOW_WHEN_LOCKED, do not show keyguard...
2010-04-13 17:59:56 -07:00
Dianne Hackborn
ae8c2c71f7 Merge "Fix issue #2420340: if FLAG_SHOW_WHEN_LOCKED, do not show keyguard..." into froyo 2010-04-13 17:57:23 -07:00
Dianne Hackborn
53d9264de4 Fix issue #2555171: Switching to app immediately after unmounting...
...SD card causes reboot.

Add option to not include temporarily unavailable recent tasks,
for the recent tasks UI to not display them.

Change-Id: I1495ca217b4292fd56f537459b44c0624262c292
2010-04-13 17:35:22 -07:00
Grace Kloba
b5c9873e7c am 53a37509: am ba6339fe: Merge "If we defer processing the touch events, pass the original view coordinate with TouchEventData and use them when we reprocess the events. We can\'t depend on contentToView() to convert the doc point to the view point. When we originall
Merge commit '53a37509c3a9301423ee6ec47c71bcea47e46d9c' into kraken

* commit '53a37509c3a9301423ee6ec47c71bcea47e46d9c':
  If we defer processing the touch events, pass the
2010-04-13 17:28:17 -07:00
Grace Kloba
53a37509c3 am ba6339fe: Merge "If we defer processing the touch events, pass the original view coordinate with TouchEventData and use them when we reprocess the events. We can\'t depend on contentToView() to convert the doc point to the view point. When we originally convert the
Merge commit 'ba6339fe2ba2d7325a99201e82d951064efa31a2' into froyo-plus-aosp

* commit 'ba6339fe2ba2d7325a99201e82d951064efa31a2':
  If we defer processing the touch events, pass the
2010-04-13 17:24:04 -07:00
Grace Kloba
ba6339fe2b Merge "If we defer processing the touch events, pass the original view coordinate with TouchEventData and use them when we reprocess the events. We can't depend on contentToView() to convert the doc point to the view point. When we originally convert the view to doc, the scroll position in UI doesn't change. When we convert the doc back to view, we are chasing a moving target. That is why we saw bigger delta." into froyo 2010-04-13 17:20:29 -07:00
Robert Greenwalt
b8912f5481 Perist Throttle data across reboots
Never got SharedPreferences working for this system service.  Didn't really need it anyway.
Using a straight up file now.

bug:2576057
Change-Id: Idad926e8242a85e22718c25f3f6c03e5749badac
2010-04-13 16:42:29 -07:00
Grace Kloba
102ed89dbc If we defer processing the touch events, pass the
original view coordinate with TouchEventData and use
them when we reprocess the events. We can't depend
on contentToView() to convert the doc point to the
view point. When we originally convert the view to
doc, the scroll position in UI doesn't change. When
we convert the doc back to view, we are chasing a
moving target. That is why we saw bigger delta.

Fix  http://b/issue?id=2577274
2010-04-13 16:27:41 -07:00
Robert Greenwalt
13ec98f313 am 84748629: am a466ffe0: am d3bb93f6: Add build config values for data use defaults 2010-04-13 16:23:09 -07:00
James Dong
748a8df0cd am c33f583b: am 4f3257cf: am dd684af8: Merge "Snif more 3GPP file types according to http://www.ftyps.com/3gpp.html" into froyo 2010-04-13 16:23:05 -07:00
Suchi Amalapurapu
3cf6bba0b6 am 2ae08f70: am a55987df: am 812b24fd: Merge "Fix crashes related to unmounting when app on sdcard has an active notification in status bar. When unmounting sdcard, all the secure containers have to be unmounted first before invoking the MountService call back. We sen 2010-04-13 16:23:01 -07:00
Robert Greenwalt
ae5ec70225 am 7024396f: am 7125a0dc: am 42843c3c: Merge "Fix Throttle Notification intents" into froyo 2010-04-13 16:22:51 -07:00
Christopher Tate
c2b8b5f8f5 am 0162c3c7: am 3643dc8c: am 3069a6da: Merge "SDK: last of the backup/restore docs content" into froyo 2010-04-13 16:22:16 -07:00
Robert Greenwalt
847486293b am a466ffe0: am d3bb93f6: Add build config values for data use defaults
Merge commit 'a466ffe042ca0a7ef14d3942114f3ea916db225e' into kraken

* commit 'a466ffe042ca0a7ef14d3942114f3ea916db225e':
  Add build config values for data use defaults
2010-04-13 16:09:19 -07:00
Robert Greenwalt
a466ffe042 am d3bb93f6: Add build config values for data use defaults
Merge commit 'd3bb93f6870581eebbf08b5b7fb0a9c5eaad8b16' into froyo-plus-aosp

* commit 'd3bb93f6870581eebbf08b5b7fb0a9c5eaad8b16':
  Add build config values for data use defaults
2010-04-13 16:07:19 -07:00
Andreas Huber
5ab60ba0c1 am d760afc3: am 30e9c2d4: am db281311: Merge "Better diagnostics in the stagefright commandline tool, support for playing sine-tones using a filename of "sine:[samplingrate]", i.e. sine:44100. Support for playing audio through to the speakers by using "-o" in addition 2010-04-13 16:05:49 -07:00
James Dong
eee53a7dfa am ebaa935e: am 9bb8e65a: am c15f48d7: Merge "Don\'t set encoder component role while we query decoders" into froyo 2010-04-13 16:05:42 -07:00
Grace Kloba
105c58de02 am 346c97c4: am 58af51a1: am 763e62a8: Fix a case introduced by https://android-git.corp.google.com/g/#change,47640 2010-04-13 16:05:34 -07:00
Amith Yamasani
ecf917b68d am 61f280d5: am feb976e6: am 842d983c: Merge "Fix an upgrade bug in SettingsProvider." into froyo 2010-04-13 16:05:27 -07:00
Jean-Michel Trivi
824ca797f0 am b8430335: am 34b2ecc8: am c30890e1: Merge "Fix bug 2578813 Delay pausing music and routing audio for car docks" into froyo 2010-04-13 16:05:21 -07:00
Gloria Wang
ce3875055e am 465934d1: am d4c072d3: am b19da8e1: Fix for 2581725. Keep the last frame after resume(), and delete it in the next suspend() or reuse it if no new frame is available. 2010-04-13 16:05:13 -07:00
Daniel Sandler
cd3f349f32 am a32efedd: am de3601e0: am bcac4960: Honor the "Never vibrate" setting for incoming calls. 2010-04-13 16:05:07 -07:00
Robert Greenwalt
d3bb93f687 Add build config values for data use defaults
Don't use hard coded defaults - use build configs instead.

Iface is now ONLY set by config so gservices doesn't need to.

bug:2576057
Change-Id: I8f9e3bc51af3b1cdf8bb4290a43197d9c01e2a14
2010-04-13 15:44:34 -07:00
James Dong
c33f583b7c am 4f3257cf: am dd684af8: Merge "Snif more 3GPP file types according to http://www.ftyps.com/3gpp.html" into froyo
Merge commit '4f3257cf4667aa28908c401634db849fd2e516af' into kraken

* commit '4f3257cf4667aa28908c401634db849fd2e516af':
  Snif more 3GPP file types according to http://www.ftyps.com/3gpp.html
2010-04-13 15:42:01 -07:00
James Dong
4f3257cf46 am dd684af8: Merge "Snif more 3GPP file types according to http://www.ftyps.com/3gpp.html" into froyo
Merge commit 'dd684af8c8fd5984d4d40b125bfac1ce268622ae' into froyo-plus-aosp

* commit 'dd684af8c8fd5984d4d40b125bfac1ce268622ae':
  Snif more 3GPP file types according to http://www.ftyps.com/3gpp.html
2010-04-13 15:37:50 -07:00
Suchi Amalapurapu
2ae08f70f2 am a55987df: am 812b24fd: Merge "Fix crashes related to unmounting when app on sdcard has an active notification in status bar. When unmounting sdcard, all the secure containers have to be unmounted first before invoking the MountService call back. We send a broadcast
Merge commit 'a55987df919240b045de977217bd55723c37dfcb' into kraken

* commit 'a55987df919240b045de977217bd55723c37dfcb':
  Fix crashes related to unmounting when app on sdcard has an active notification
2010-04-13 15:36:10 -07:00
James Dong
dd684af8c8 Merge "Snif more 3GPP file types according to http://www.ftyps.com/3gpp.html" into froyo 2010-04-13 15:34:20 -07:00
Suchi Amalapurapu
a55987df91 am 812b24fd: Merge "Fix crashes related to unmounting when app on sdcard has an active notification in status bar. When unmounting sdcard, all the secure containers have to be unmounted first before invoking the MountService call back. We send a broadcast about disabl
Merge commit '812b24fd9d254f37e34f2878f599253a1f3bffe9' into froyo-plus-aosp

* commit '812b24fd9d254f37e34f2878f599253a1f3bffe9':
  Fix crashes related to unmounting when app on sdcard has an active notification
2010-04-13 15:32:59 -07:00
Suchi Amalapurapu
812b24fd9d Merge "Fix crashes related to unmounting when app on sdcard has an active notification in status bar. When unmounting sdcard, all the secure containers have to be unmounted first before invoking the MountService call back. We send a broadcast about disabled packages. Force a gc to clean up any stale asset references and then unmount the containers before invoking the MountService call back." into froyo 2010-04-13 15:30:07 -07:00
Robert Greenwalt
7024396fc2 am 7125a0dc: am 42843c3c: Merge "Fix Throttle Notification intents" into froyo
Merge commit '7125a0dca844b066a3f6ebdacaea4ade9e651c8d' into kraken

* commit '7125a0dca844b066a3f6ebdacaea4ade9e651c8d':
  Fix Throttle Notification intents
2010-04-13 15:29:19 -07:00
Robert Greenwalt
7125a0dca8 am 42843c3c: Merge "Fix Throttle Notification intents" into froyo
Merge commit '42843c3ceb8b17e860112f8f2718cda40de15839' into froyo-plus-aosp

* commit '42843c3ceb8b17e860112f8f2718cda40de15839':
  Fix Throttle Notification intents
2010-04-13 15:25:05 -07:00
Robert Greenwalt
42843c3ceb Merge "Fix Throttle Notification intents" into froyo 2010-04-13 15:22:00 -07:00
James Dong
e1130662d0 Snif more 3GPP file types according to http://www.ftyps.com/3gpp.html
bug - 2575956

Change-Id: Iaa79e74d3b0585397a7e833ec45472710fc52fa6
2010-04-13 15:09:26 -07:00
Vasu Nori
c8e1f23891 verify database state before calling sqlite. Bug:2593970
Change-Id: Id68365abccbdca572ad13c2b51162d53993ff540
2010-04-13 15:05:09 -07:00