10127 Commits

Author SHA1 Message Date
Daniel Sandler
a976eccf6b Merge "Missing resources for lock screen." into kraken 2010-04-14 12:15:04 -07:00
Andrei Popescu
0476f7a063 am 6083f5eb: am 01e3feaf: Merge "Make sure the onended event is dispatched even when the user dismisses the video before it plays to completion." into froyo
Merge commit '6083f5eb1b1ee5bb026c99cb5018f0d3cc5f5ff3' into kraken

* commit '6083f5eb1b1ee5bb026c99cb5018f0d3cc5f5ff3':
  Make sure the onended event is dispatched even when
2010-04-14 12:11:21 -07:00
Dianne Hackborn
093d621c2f am 11d7502b: am 8656145e: Merge "Fix issue #593153: Broadcast time out when sending..." into froyo
Merge commit '11d7502b35374da12168004e277bcc87f4f7bb50' into kraken

* commit '11d7502b35374da12168004e277bcc87f4f7bb50':
  Fix issue #593153: Broadcast time out when sending...
2010-04-14 12:11:17 -07:00
Robert Greenwalt
eaa8b1a7da am 57e60854: am 22b3644a: Update the datause icons.
Merge commit '57e60854f3c7a64aad3c4178df210c6f3e98ee8b' into kraken

* commit '57e60854f3c7a64aad3c4178df210c6f3e98ee8b':
  Update the datause icons.
2010-04-14 12:11:07 -07:00
Leon Scroggins
7ba155bf5a am 876a5dfe: am b2212464: Merge "Ensure the selection does not change in setTextAndKeepSelection." into froyo
Merge commit '876a5dfe3b4a7e0b7bba6b6227a2db2038f29976' into kraken

* commit '876a5dfe3b4a7e0b7bba6b6227a2db2038f29976':
  Ensure the selection does not change in setTextAndKeepSelection.
2010-04-14 12:10:58 -07:00
Kristian Monsen
d2688cb1de am a18df134: am d503a152: Merge "Fix for 2585858, load invalid urls." into froyo
Merge commit 'a18df1341e29ee08c0c406cc9b1e76b7f6921fa7' into kraken

* commit 'a18df1341e29ee08c0c406cc9b1e76b7f6921fa7':
  Fix for 2585858, load invalid urls.
2010-04-14 12:10:53 -07:00
Kristian Monsen
11d60e0b33 am 3e360000: am 53c0c0da: Merge "Fix (again) for bug 2558156, update cache encoding correctly" into froyo
Merge commit '3e360000fcb1cc60d8786d1340f9a468014c6435' into kraken

* commit '3e360000fcb1cc60d8786d1340f9a468014c6435':
  Fix (again) for bug 2558156, update cache encoding correctly
2010-04-14 12:10:47 -07:00
Andrei Popescu
6083f5eb1b am 01e3feaf: Merge "Make sure the onended event is dispatched even when the user dismisses the video before it plays to completion." into froyo
Merge commit '01e3feaf54ce6ef2ad4b9fc30f602bafd99cf412' into froyo-plus-aosp

* commit '01e3feaf54ce6ef2ad4b9fc30f602bafd99cf412':
  Make sure the onended event is dispatched even when
2010-04-14 12:04:13 -07:00
Dianne Hackborn
11d7502b35 am 8656145e: Merge "Fix issue #593153: Broadcast time out when sending..." into froyo
Merge commit '8656145e2abe881caffa4181ee5c2e4e3dba1cee' into froyo-plus-aosp

* commit '8656145e2abe881caffa4181ee5c2e4e3dba1cee':
  Fix issue #593153: Broadcast time out when sending...
2010-04-14 12:04:07 -07:00
Daniel Sandler
aa9b5b8171 Missing resources for lock screen.
The manual integration (kraken change Ide3ad839) of froyo
change I6872c3ad skipped these.

Change-Id: I11102c4ac988cbcd91eb38b7d60e493079dd715e
2010-04-14 15:03:42 -04:00
Robert Greenwalt
57e60854f3 am 22b3644a: Update the datause icons.
Merge commit '22b3644ac2027d055a6b187c979ef492ee6fb082' into froyo-plus-aosp

* commit '22b3644ac2027d055a6b187c979ef492ee6fb082':
  Update the datause icons.
2010-04-14 12:03:33 -07:00
Leon Scroggins
876a5dfe3b am b2212464: Merge "Ensure the selection does not change in setTextAndKeepSelection." into froyo
Merge commit 'b2212464a3bc4103a9e5e88602d1097c835d7949' into froyo-plus-aosp

* commit 'b2212464a3bc4103a9e5e88602d1097c835d7949':
  Ensure the selection does not change in setTextAndKeepSelection.
2010-04-14 12:02:53 -07:00
Kristian Monsen
a18df1341e am d503a152: Merge "Fix for 2585858, load invalid urls." into froyo
Merge commit 'd503a1524acfcaa85c658240ff88f54d174cbb9e' into froyo-plus-aosp

* commit 'd503a1524acfcaa85c658240ff88f54d174cbb9e':
  Fix for 2585858, load invalid urls.
2010-04-14 12:02:10 -07:00
Kristian Monsen
3e360000fc am 53c0c0da: Merge "Fix (again) for bug 2558156, update cache encoding correctly" into froyo
Merge commit '53c0c0daf42ca69163fdc1233b3eaca7e382783f' into froyo-plus-aosp

* commit '53c0c0daf42ca69163fdc1233b3eaca7e382783f':
  Fix (again) for bug 2558156, update cache encoding correctly
2010-04-14 12:02:01 -07:00
Andrei Popescu
01e3feaf54 Merge "Make sure the onended event is dispatched even when the user dismisses the video before it plays to completion." into froyo 2010-04-14 10:26:58 -07:00
Dianne Hackborn
399cccb857 Fix issue #593153: Broadcast time out when sending...
...ordered broadcast for ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE

Turns out this was because the broadcast receiver for ContextImpl was
not correctly being created, so when it received an ordered broadcast
it would not tell the activity manager when it was done.

This is now fixed, along with a ton of superficial changes to debug
output to help track this down and a little cleanup of dealing with
error cases in dispatching broadcasts.  Also a fix for a NPE when
dumping the broadcast state.

Finally, a little fiddling with package manager to get rid of a lot
of the noise when removing and re-adding packages on the SD card.

Change-Id: I961c14836dc613d3ea8122b6e910ef866e7fcb25
2010-04-14 09:54:21 -07:00
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
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
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
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
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
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
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
Christopher Tate
0162c3c7aa am 3643dc8c: am 3069a6da: Merge "SDK: last of the backup/restore docs content" into froyo
Merge commit '3643dc8c73bbf53c7aa6bb73d09d83c7578639e0' into kraken

* commit '3643dc8c73bbf53c7aa6bb73d09d83c7578639e0':
  SDK: last of the backup/restore docs content
2010-04-13 14:29:28 -07:00
Christopher Tate
3643dc8c73 am 3069a6da: Merge "SDK: last of the backup/restore docs content" into froyo
Merge commit '3069a6dafabd5a6ba2b1378e2c3b48adb9ba8778' into froyo-plus-aosp

* commit '3069a6dafabd5a6ba2b1378e2c3b48adb9ba8778':
  SDK: last of the backup/restore docs content
2010-04-13 14:24:54 -07:00
Christopher Tate
3069a6dafa Merge "SDK: last of the backup/restore docs content" into froyo 2010-04-13 14:21:48 -07:00
Grace Kloba
346c97c477 am 58af51a1: am 763e62a8: Fix a case introduced by https://android-git.corp.google.com/g/#change,47640
Merge commit '58af51a1f2afc20ac1f1465b13c300754358be6c' into kraken

* commit '58af51a1f2afc20ac1f1465b13c300754358be6c':
  Fix a case introduced by https://android-git.corp.google.com/g/#change,47640
2010-04-13 12:20:35 -07:00
Grace Kloba
58af51a1f2 am 763e62a8: Fix a case introduced by https://android-git.corp.google.com/g/#change,47640
Merge commit '763e62a831f6cf4e113bff868dab4d48560a3693' into froyo-plus-aosp

* commit '763e62a831f6cf4e113bff868dab4d48560a3693':
  Fix a case introduced by https://android-git.corp.google.com/g/#change,47640
2010-04-13 12:14:32 -07:00
Leon Scroggins
3fcf486359 Ensure the selection does not change in setTextAndKeepSelection.
Bug: 2589778
Change-Id: I72752797003216fdd12cebffbdf4cd9ffbf523e1
2010-04-13 15:08:18 -04:00
Jean-Michel Trivi
b843033566 am 34b2ecc8: am c30890e1: Merge "Fix bug 2578813 Delay pausing music and routing audio for car docks" into froyo
Merge commit '34b2ecc82aae3d317c2f4985049f68df3f8adbd7' into kraken

* commit '34b2ecc82aae3d317c2f4985049f68df3f8adbd7':
  Fix bug 2578813 Delay pausing music and routing audio for car docks
2010-04-13 11:53:57 -07:00
Grace Kloba
763e62a831 Fix a case introduced by https://android-git.corp.google.com/g/#change,47640
We skipped a call to WebKit at the end of the zoom
animation in the last CL.

Fix http://b/issue?id=2578820
2010-04-13 11:35:10 -07:00
Jean-Michel Trivi
34b2ecc82a am c30890e1: Merge "Fix bug 2578813 Delay pausing music and routing audio for car docks" into froyo
Merge commit 'c30890e102cbae24e4c821ba4274f6ac8b18f1db' into froyo-plus-aosp

* commit 'c30890e102cbae24e4c821ba4274f6ac8b18f1db':
  Fix bug 2578813 Delay pausing music and routing audio for car docks
2010-04-13 09:54:47 -07:00
Jean-Michel Trivi
4c637b9e34 Fix bug 2578813 Delay pausing music and routing audio for car docks
Moved broadcast of ACTION_AUDIO_BECOMING_NOISY from BluetoothA2dpService
to AudioService.
Broadcast ACTION_AUDIO_BECOMING_NOISY when disconnecting an A2DP
device.
Disconnect from A2DP docks with a delay to handle transient
disconnections.
Cancel delayed A2DP disconnections when connecting to a dock as this
can be a reconnection after a transient disconnection.

Change-Id: I1ee9e99f3ffa20727af38a4c4c8711942894a696
2010-04-13 09:44:08 -07:00
Kristian Monsen
b2d95503fd Fix for 2585858, load invalid urls.
The browser currently does not try to load invalid urls, that can be a problem. Now we only check if the host is correctly encoded.

Change-Id: Ie7380c59d4faab68a2f957e7f1ba8347e15e45a1
2010-04-13 16:48:32 +01:00
Daniel Sandler
8dc634e82f am b0cc22b4: am 15683534: Merge "Hide e-call button in layout." into froyo
Merge commit 'b0cc22b4059ea49623defa1c118db9abdd59a0be' into kraken

* commit 'b0cc22b4059ea49623defa1c118db9abdd59a0be':
  Hide e-call button in layout.
2010-04-13 06:10:10 -07:00
Daniel Sandler
b0cc22b405 am 15683534: Merge "Hide e-call button in layout." into froyo
Merge commit '15683534d1f1ca76a9a59ed921219db46ff5f800' into froyo-plus-aosp

* commit '15683534d1f1ca76a9a59ed921219db46ff5f800':
  Hide e-call button in layout.
2010-04-13 06:05:20 -07:00
Daniel Sandler
15683534d1 Merge "Hide e-call button in layout." into froyo 2010-04-13 06:00:02 -07:00
Christopher Tate
7cc088232d SDK: last of the backup/restore docs content
There is probably still some editing and cleanup to do, but this takes care
of the last of the "need this documented by the time we ship!" material.

Bug #2465360

Change-Id: Ic4ce9e5a07c79aa2b584a18012a2e8fe199c19fd
2010-04-12 18:24:05 -07:00
Mathias Agopian
8b138323d5 don't hardcode "mSurface" throughout our source code
this is used in a few places to get access to the android.view.Surface
native surface. use a macro instead. Also rename the field to mNativeSurface.

Change-Id: I1c6dea14abd6b8b1392c7f97b304115999355094
2010-04-12 16:29:36 -07:00
Christopher Tate
5c7a69c3d6 am 6a75d685: am 7e8614a5: Merge "SDK: more backup/restore documentation work" into froyo
Merge commit '6a75d6850c77fb48daba7700621856605ab60569' into kraken

* commit '6a75d6850c77fb48daba7700621856605ab60569':
  SDK: more backup/restore documentation work
2010-04-12 16:23:35 -07:00
Christopher Tate
6a75d6850c am 7e8614a5: Merge "SDK: more backup/restore documentation work" into froyo
Merge commit '7e8614a547eca78dd9178001f8f6c38444adf350' into froyo-plus-aosp

* commit '7e8614a547eca78dd9178001f8f6c38444adf350':
  SDK: more backup/restore documentation work
2010-04-12 16:18:16 -07:00
Christopher Tate
4e14a82912 SDK: more backup/restore documentation work
Still not complete, but here's a lot more of the necessary documentation.
Submitting a checkpoint seems prudent.

Bug #2465360

Change-Id: Ifff60d57e4b24cee21f3a34f5f50e290d377c386
2010-04-12 15:42:16 -07:00