22408 Commits

Author SHA1 Message Date
Daniel Sandler
9fa47c0831 am a976eccf: Merge "Missing resources for lock screen." into kraken 2010-04-15 06:38:47 -07:00
Eric Laurent
491f250583 am 5db9adfd: am 834f0483: am 745b43c2: Merge "Fix issue 2589563: Able to set ringer volume to 0 outside of silent mode." into froyo 2010-04-15 06:38:39 -07:00
Andrei Popescu
7a8a91d1b0 am 0476f7a0: 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 2010-04-15 06:38:29 -07:00
Dianne Hackborn
97107f0497 am 093d621c: am 11d7502b: am 8656145e: Merge "Fix issue #593153: Broadcast time out when sending..." into froyo 2010-04-15 06:38:20 -07:00
James Dong
e3fcad3432 am fff02afa: am 6852b198: am d3d445b1: Merge "Use PV_PLAYER to handle RTSP streaming" into froyo 2010-04-15 06:38:10 -07:00
Robert Greenwalt
59019368cf am eaa8b1a7: am 57e60854: am 22b3644a: Update the datause icons. 2010-04-15 06:38:02 -07:00
Robert Greenwalt
f799996531 am c059f342: am b26c8dd4: am 9cb66e89: Merge "Perist Throttle data across reboots" into froyo 2010-04-15 06:37:52 -07:00
Leon Scroggins
67329aa3ec am 7ba155bf: am 876a5dfe: am b2212464: Merge "Ensure the selection does not change in setTextAndKeepSelection." into froyo 2010-04-15 06:37:43 -07:00
Kristian Monsen
c8c5363df3 am d2688cb1: am a18df134: am d503a152: Merge "Fix for 2585858, load invalid urls." into froyo 2010-04-15 06:37:33 -07:00
Kristian Monsen
42ae4885ed am 11d60e0b: am 3e360000: am 53c0c0da: Merge "Fix (again) for bug 2558156, update cache encoding correctly" into froyo 2010-04-15 06:37:21 -07:00
Jean-Baptiste Queru
c716307594 am 31a17033: fix unintentional drift 2010-04-15 06:36:35 -07:00
Jean-Baptiste Queru
561f735eac am 0b23c143: (-s ours) manual merge 2010-04-15 06:35:59 -07:00
Romain Guy
1b2d7ec487 Merge "Ensure Gallery does not unselect the selected item after a layout. Bug #2573921" 2010-04-14 14:45:43 -07:00
Romain Guy
6691fcfbc8 Ensure Gallery does not unselect the selected item after a layout.
Bug #2573921

Change-Id: I5c39881f541835fe5515b35a9f12761a8a2c1b8b
2010-04-14 14:43:18 -07:00
Daniel Sandler
a976eccf6b Merge "Missing resources for lock screen." into kraken 2010-04-14 12:15:04 -07:00
Eric Laurent
5db9adfd40 am 834f0483: am 745b43c2: Merge "Fix issue 2589563: Able to set ringer volume to 0 outside of silent mode." into froyo
Merge commit '834f0483ee7259f19e3f5d8e5c09ddcf875535b1' into kraken

* commit '834f0483ee7259f19e3f5d8e5c09ddcf875535b1':
  Fix issue 2589563: Able to set ringer volume to 0 outside of silent mode.
2010-04-14 12:11:24 -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
James Dong
fff02afa01 am 6852b198: am d3d445b1: Merge "Use PV_PLAYER to handle RTSP streaming" into froyo
Merge commit '6852b198fbedd9378ed79ca6528a4d6f33b0b677' into kraken

* commit '6852b198fbedd9378ed79ca6528a4d6f33b0b677':
  Use PV_PLAYER to handle RTSP streaming
2010-04-14 12:11:12 -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
Robert Greenwalt
c059f34230 am b26c8dd4: am 9cb66e89: Merge "Perist Throttle data across reboots" into froyo
Merge commit 'b26c8dd432bf0ea8042e04e63c57913c7bd4e3d4' into kraken

* commit 'b26c8dd432bf0ea8042e04e63c57913c7bd4e3d4':
  Perist Throttle data across reboots
2010-04-14 12:11:03 -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
Eric Laurent
834f0483ee am 745b43c2: Merge "Fix issue 2589563: Able to set ringer volume to 0 outside of silent mode." into froyo
Merge commit '745b43c28fd6bb82c72a15b28be75c55dd115171' into froyo-plus-aosp

* commit '745b43c28fd6bb82c72a15b28be75c55dd115171':
  Fix issue 2589563: Able to set ringer volume to 0 outside of silent mode.
2010-04-14 12:04:16 -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
James Dong
6852b198fb am d3d445b1: Merge "Use PV_PLAYER to handle RTSP streaming" into froyo
Merge commit 'd3d445b1dca98728a37b5163e018ba890fd9cc50' into froyo-plus-aosp

* commit 'd3d445b1dca98728a37b5163e018ba890fd9cc50':
  Use PV_PLAYER to handle RTSP streaming
2010-04-14 12:03:53 -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
Robert Greenwalt
b26c8dd432 am 9cb66e89: Merge "Perist Throttle data across reboots" into froyo
Merge commit '9cb66e89cd0c4bfa8d77591719023b7153fee9b9' into froyo-plus-aosp

* commit '9cb66e89cd0c4bfa8d77591719023b7153fee9b9':
  Perist Throttle data across reboots
2010-04-14 12:03:22 -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
Dianne Hackborn
7946d07183 Merge "2593810 Accessibility event's parcelableData property not nullified during recycling" 2010-04-14 12:00:32 -07:00
Dianne Hackborn
a3edb681ef Merge " 2593833 AccessibilityManager not properly initialized immediately upon registration in the AccessibilityManagerService" 2010-04-14 12:00:17 -07:00
Mike Reed
d404d6f162 update dox for FILL_AND_STROKE style
Change-Id: I7835068a376dfa4d8c18d8bb20d97941a058e89f
http://b/issue?id=2590047
2010-04-14 14:46:46 -04:00
Jean-Baptiste Queru
31a17033dc fix unintentional drift
Change-Id: I0bbf3d3f95296a41d71558d8de1ed2ed021f21cf
2010-04-14 10:40:28 -07:00
Eric Laurent
745b43c28f Merge "Fix issue 2589563: Able to set ringer volume to 0 outside of silent mode." into froyo 2010-04-14 10:39:32 -07:00
Jean-Baptiste Queru
0b23c1436a manual merge
Change-Id: I0a81f92831dabc518cfd33b40ea93fd496a1a01c
2010-04-14 10:29:49 -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
8656145e2a Merge "Fix issue #593153: Broadcast time out when sending..." into froyo 2010-04-14 10:16:35 -07:00
James Dong
d3d445b1dc Merge "Use PV_PLAYER to handle RTSP streaming" into froyo 2010-04-14 09:59:33 -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
Tom O'Neill
c096a9aead Minor fixes in hello-tabwidget.jd
Fix some typos, including a few that lead to non-functioning code.

Change-Id: I99e6f290189ec7451a7ceffb14f5ac2a1159673f
2010-04-14 09:36:37 -07:00
Eric Laurent
527c3ab51e Fix issue 2589563: Able to set ringer volume to 0 outside of silent mode.
The problem happens only if volume down key is pressed while
already in silent or vibrate mode. In this case, AudioService accepts
changing the last audible index for ringer volume from 1 to 0.
When volume up is pressed, current ringer volume value is restored from 0
instead of 1.

The fix consists in keeping last audible index at 1 once in silent of vibrate
mode even is volume down key is pressed.

Change-Id: Id08edd12ce985c22233124545eba2c3e4b8cdc8e
2010-04-14 09:32:17 -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
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