OSDN Git Service
Mike LeBeau [Fri, 16 Apr 2010 14:30:18 +0000 (07:30 -0700)]
am
f04be52a: am
0c5ad4f1: Merge "For search suggestions in the search dialog, allow the \'title\' line of text to be up to 2 lines (rather than the usual 1) if no \'description\' line is provided." into froyo
Merge commit '
f04be52a382544ff8006e227c1578a219ba0f23e' into kraken
* commit '
f04be52a382544ff8006e227c1578a219ba0f23e':
For search suggestions in the search dialog, allow the 'title'
Mike LeBeau [Fri, 16 Apr 2010 14:27:34 +0000 (07:27 -0700)]
am
0c5ad4f1: Merge "For search suggestions in the search dialog, allow the \'title\' line of text to be up to 2 lines (rather than the usual 1) if no \'description\' line is provided." into froyo
Merge commit '
0c5ad4f1b35ebf3319b68126bd7b4c8a3eb0340a' into froyo-plus-aosp
* commit '
0c5ad4f1b35ebf3319b68126bd7b4c8a3eb0340a':
For search suggestions in the search dialog, allow the 'title'
Mike LeBeau [Fri, 16 Apr 2010 14:23:12 +0000 (07:23 -0700)]
Merge "For search suggestions in the search dialog, allow the 'title' line of text to be up to 2 lines (rather than the usual 1) if no 'description' line is provided." into froyo
Mike Lockwood [Fri, 16 Apr 2010 03:26:33 +0000 (20:26 -0700)]
Merge "GpsLocationProvider: Eliminate MIN_FIX_COUNT." into kraken
Mike Lockwood [Fri, 16 Apr 2010 03:26:09 +0000 (20:26 -0700)]
Merge "GpsLocationProvider: Remove NTP sanity checking now that the NTP client has been fixed." into kraken
Jim Miller [Fri, 16 Apr 2010 00:55:18 +0000 (17:55 -0700)]
Merge "Manual merge of Ida6a4cdd3abcbcab7e2fe8450a25c0dc36765f04" into kraken
Jim Miller [Fri, 16 Apr 2010 00:47:01 +0000 (17:47 -0700)]
Merge "Manual merge of Idf6bb25438336616e6453e7afe0e79f227af98d3" into kraken
Robert Greenwalt [Fri, 16 Apr 2010 00:45:26 +0000 (17:45 -0700)]
am
32ebaf57: am
e80c6f49: Merge "Add multi-sim support to ThrottleService." into froyo
Merge commit '
32ebaf57d8646542b80e848441830a5ef834aed3' into kraken
* commit '
32ebaf57d8646542b80e848441830a5ef834aed3':
Add multi-sim support to ThrottleService.
Robert Greenwalt [Fri, 16 Apr 2010 00:42:24 +0000 (17:42 -0700)]
am
e80c6f49: Merge "Add multi-sim support to ThrottleService." into froyo
Merge commit '
e80c6f49d5055e299b7ada91b5967feab66e467b' into froyo-plus-aosp
* commit '
e80c6f49d5055e299b7ada91b5967feab66e467b':
Add multi-sim support to ThrottleService.
Robert Greenwalt [Fri, 16 Apr 2010 00:37:55 +0000 (17:37 -0700)]
Merge "Add multi-sim support to ThrottleService." into froyo
Mathias Agopian [Thu, 15 Apr 2010 22:24:35 +0000 (15:24 -0700)]
Merge "when a zero dimension buffer is allocated, turn the allocation into a 1x1 buffer instead of Nx1 (or 1xN)" into kraken
Mathias Agopian [Thu, 15 Apr 2010 21:57:39 +0000 (14:57 -0700)]
when a zero dimension buffer is allocated, turn the allocation into
a 1x1 buffer instead of Nx1 (or 1xN)
Change-Id: I27eeb15e83e13002dd9405f4e52b54f7dffc0fe7
Dianne Hackborn [Thu, 15 Apr 2010 21:41:13 +0000 (14:41 -0700)]
Merge "Introduce new API version to avoid breakage with the Froyo APIs; introduce padding in the resources to avoid cross-branch merge pain." into kraken
Dianne Hackborn [Thu, 15 Apr 2010 20:39:16 +0000 (13:39 -0700)]
am
292bdbd9: am
e3094117: Merge "A little more improvement of the Service javadoc." into froyo
Merge commit '
292bdbd9c4503d3f79d0fa8dd12074c0d4dd5293' into kraken
* commit '
292bdbd9c4503d3f79d0fa8dd12074c0d4dd5293':
A little more improvement of the Service javadoc.
Robert Greenwalt [Thu, 15 Apr 2010 20:37:31 +0000 (13:37 -0700)]
am
d65d5f11: am
bf943f29: Merge "Fix SntpClient to give accurate time info." into froyo
Merge commit '
d65d5f114f74ed4d7d4defee5d56eeaa133fda72' into kraken
* commit '
d65d5f114f74ed4d7d4defee5d56eeaa133fda72':
Fix SntpClient to give accurate time info.
Dianne Hackborn [Thu, 15 Apr 2010 20:36:44 +0000 (13:36 -0700)]
am
e3094117: Merge "A little more improvement of the Service javadoc." into froyo
Merge commit '
e3094117a094d8ed2dbd2f4cac15e48b73ceadf4' into froyo-plus-aosp
* commit '
e3094117a094d8ed2dbd2f4cac15e48b73ceadf4':
A little more improvement of the Service javadoc.
Dianne Hackborn [Thu, 15 Apr 2010 20:33:21 +0000 (13:33 -0700)]
Merge "A little more improvement of the Service javadoc." into froyo
Robert Greenwalt [Thu, 15 Apr 2010 20:33:03 +0000 (13:33 -0700)]
am
bf943f29: Merge "Fix SntpClient to give accurate time info." into froyo
Merge commit '
bf943f296864d9647268fb5a55805ebf1fcba173' into froyo-plus-aosp
* commit '
bf943f296864d9647268fb5a55805ebf1fcba173':
Fix SntpClient to give accurate time info.
Robert Greenwalt [Thu, 15 Apr 2010 20:28:43 +0000 (13:28 -0700)]
Merge "Fix SntpClient to give accurate time info." into froyo
David 'Digit' Turner [Thu, 15 Apr 2010 19:23:59 +0000 (12:23 -0700)]
am
7a4b22f6: am
4f99e3c2: Remove native binaries when an updated system application is upgraded through OTA.
Merge commit '
7a4b22f6293c7dce2dd667b7ebd171af2eff91a9' into kraken
* commit '
7a4b22f6293c7dce2dd667b7ebd171af2eff91a9':
Remove native binaries when an updated system application is upgraded through OTA.
David 'Digit' Turner [Thu, 15 Apr 2010 19:19:23 +0000 (12:19 -0700)]
am
4f99e3c2: Remove native binaries when an updated system application is upgraded through OTA.
Merge commit '
4f99e3c28449833b10ee23c538246847fdb6a498' into froyo-plus-aosp
* commit '
4f99e3c28449833b10ee23c538246847fdb6a498':
Remove native binaries when an updated system application is upgraded through OTA.
Kenny Root [Thu, 15 Apr 2010 13:43:29 +0000 (06:43 -0700)]
am
2349dc5d: am
fa22de79: Merge "Import revised translations" into froyo
Merge commit '
2349dc5d7aac9c0bde9fc38f69114db0f38ed319' into kraken
* commit '
2349dc5d7aac9c0bde9fc38f69114db0f38ed319':
Import revised translations
Kenny Root [Thu, 15 Apr 2010 13:00:18 +0000 (06:00 -0700)]
am
fa22de79: Merge "Import revised translations" into froyo
Merge commit '
fa22de7993f94d338330a888bdc2aeaaf857c719' into froyo-plus-aosp
* commit '
fa22de7993f94d338330a888bdc2aeaaf857c719':
Import revised translations
Kenny Root [Thu, 15 Apr 2010 12:55:00 +0000 (05:55 -0700)]
Merge "Import revised translations" into froyo
Mike Lockwood [Thu, 15 Apr 2010 12:53:05 +0000 (05:53 -0700)]
am
f5a886d5: am
93597ed1: Merge "Fix wakelock leak in PowerManagerService.sendNotificationLocked()" into froyo
Merge commit '
f5a886d5210320724236ce6efde926e0a3c24997' into kraken
* commit '
f5a886d5210320724236ce6efde926e0a3c24997':
Fix wakelock leak in PowerManagerService.sendNotificationLocked()
Mike Lockwood [Thu, 15 Apr 2010 12:48:26 +0000 (05:48 -0700)]
am
93597ed1: Merge "Fix wakelock leak in PowerManagerService.sendNotificationLocked()" into froyo
Merge commit '
93597ed1839de164c81f83832d4c2373ea32ac8f' into froyo-plus-aosp
* commit '
93597ed1839de164c81f83832d4c2373ea32ac8f':
Fix wakelock leak in PowerManagerService.sendNotificationLocked()
Mike Lockwood [Thu, 15 Apr 2010 12:45:21 +0000 (05:45 -0700)]
Merge "Fix wakelock leak in PowerManagerService.sendNotificationLocked()" into froyo
Dianne Hackborn [Thu, 15 Apr 2010 05:31:06 +0000 (22:31 -0700)]
Dianne Hackborn [Thu, 15 Apr 2010 05:27:10 +0000 (22:27 -0700)]
Robert Greenwalt [Thu, 15 Apr 2010 03:30:31 +0000 (20:30 -0700)]
am
1424d1d2: am
8090edae: Merge "Sholes mobile iface comes/goes - handle the reset" into froyo
Merge commit '
1424d1d22e199c716c5d248611e58ce7c3f15c7e' into kraken
* commit '
1424d1d22e199c716c5d248611e58ce7c3f15c7e':
Sholes mobile iface comes/goes - handle the reset
Suchi Amalapurapu [Thu, 15 Apr 2010 03:30:27 +0000 (20:30 -0700)]
am
0751d1ea: am
deb69370: Revert "Add ordered broadcast when removing packages." Couple of cosmetic fixes as well.
Merge commit '
0751d1eaad55603eaeb0f035a55935f713ab0476' into kraken
* commit '
0751d1eaad55603eaeb0f035a55935f713ab0476':
Revert "Add ordered broadcast when removing packages."
Robert Greenwalt [Thu, 15 Apr 2010 03:25:51 +0000 (20:25 -0700)]
am
8090edae: Merge "Sholes mobile iface comes/goes - handle the reset" into froyo
Merge commit '
8090edae9ed1228e8cbaa14dd94c6ce885a0b729' into froyo-plus-aosp
* commit '
8090edae9ed1228e8cbaa14dd94c6ce885a0b729':
Sholes mobile iface comes/goes - handle the reset
Suchi Amalapurapu [Thu, 15 Apr 2010 03:25:48 +0000 (20:25 -0700)]
am
deb69370: Revert "Add ordered broadcast when removing packages." Couple of cosmetic fixes as well.
Merge commit '
deb69370ef9a786940ae49411ba657410361b4f1' into froyo-plus-aosp
* commit '
deb69370ef9a786940ae49411ba657410361b4f1':
Revert "Add ordered broadcast when removing packages."
Robert Greenwalt [Thu, 15 Apr 2010 03:23:45 +0000 (20:23 -0700)]
Merge "Sholes mobile iface comes/goes - handle the reset" into froyo
Dianne Hackborn [Thu, 15 Apr 2010 02:09:52 +0000 (19:09 -0700)]
am
68ca59e9: am
b0ef1442: Merge "Fix issue #258640: Automatic propagation of FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET" into froyo
Merge commit '
68ca59e9e69ab4c997987fb0390382a2461386eb' into kraken
* commit '
68ca59e9e69ab4c997987fb0390382a2461386eb':
Fix issue #258640: Automatic propagation of FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET
Dianne Hackborn [Thu, 15 Apr 2010 02:05:11 +0000 (19:05 -0700)]
am
b0ef1442: Merge "Fix issue #258640: Automatic propagation of FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET" into froyo
Merge commit '
b0ef1442866ec52a772e6edfab732a2c987bbee0' into froyo-plus-aosp
* commit '
b0ef1442866ec52a772e6edfab732a2c987bbee0':
Fix issue #258640: Automatic propagation of FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET
Dianne Hackborn [Thu, 15 Apr 2010 02:02:00 +0000 (19:02 -0700)]
Merge "Fix issue #258640: Automatic propagation of FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET" into froyo
Dmitri Plotnikov [Thu, 15 Apr 2010 01:40:17 +0000 (18:40 -0700)]
am
13932d85: am
5304d8fd: Merge "Introducing "strict project map"." into froyo
Merge commit '
13932d85066f191db09c4a2fecfa563f0d63d7b7' into kraken
* commit '
13932d85066f191db09c4a2fecfa563f0d63d7b7':
Introducing "strict project map".
Dmitri Plotnikov [Thu, 15 Apr 2010 01:36:36 +0000 (18:36 -0700)]
am
5304d8fd: Merge "Introducing "strict project map"." into froyo
Merge commit '
5304d8fdc9064f2831ef16db9242f17110287997' into froyo-plus-aosp
* commit '
5304d8fdc9064f2831ef16db9242f17110287997':
Introducing "strict project map".
Suchi Amalapurapu [Thu, 15 Apr 2010 01:34:21 +0000 (18:34 -0700)]
am
2ef6e442: am
28b2fdc5: Merge "Dont fall back to installing on sdcard when internal storage is filled up when the install location is set to internal only. Similary if install location is set to external only(via adb), dont fall back to installing on internal storag
Merge commit '
2ef6e44269ba3c9f6b5d22352461555ebab33b73' into kraken
* commit '
2ef6e44269ba3c9f6b5d22352461555ebab33b73':
Dont fall back to installing on sdcard when internal storage is filled up
Dmitri Plotnikov [Thu, 15 Apr 2010 01:33:54 +0000 (18:33 -0700)]
Merge "Introducing "strict project map"." into froyo
Suchi Amalapurapu [Thu, 15 Apr 2010 01:31:37 +0000 (18:31 -0700)]
am
28b2fdc5: Merge "Dont fall back to installing on sdcard when internal storage is filled up when the install location is set to internal only. Similary if install location is set to external only(via adb), dont fall back to installing on internal storage if sdcard i
Merge commit '
28b2fdc5ee0ad75a476b825e3657b1decd0a2b7c' into froyo-plus-aosp
* commit '
28b2fdc5ee0ad75a476b825e3657b1decd0a2b7c':
Dont fall back to installing on sdcard when internal storage is filled up
Suchi Amalapurapu [Thu, 15 Apr 2010 01:28:22 +0000 (18:28 -0700)]
Merge "Dont fall back to installing on sdcard when internal storage is filled up when the install location is set to internal only. Similary if install location is set to external only(via adb), dont fall back to installing on internal storage if sdcard is filled up. If nothing is specified ie install location is set to let system decide, we just check on internal storage. Fix tests" into froyo
Mathias Agopian [Thu, 15 Apr 2010 01:25:21 +0000 (18:25 -0700)]
am
e7d5a2f9: am
45423465: Merge "fix [
2594950] Flash: Zooming in on some content crashes the Nexus One and causes it to reboot (runtime restart)" into froyo
Merge commit '
e7d5a2f9ae47d8ea8face3f1e451314ed36f4026' into kraken
* commit '
e7d5a2f9ae47d8ea8face3f1e451314ed36f4026':
fix [
2594950] Flash: Zooming in on some content crashes the Nexus One and causes it to reboot (runtime restart)
Mathias Agopian [Thu, 15 Apr 2010 01:22:33 +0000 (18:22 -0700)]
am
45423465: Merge "fix [
2594950] Flash: Zooming in on some content crashes the Nexus One and causes it to reboot (runtime restart)" into froyo
Merge commit '
454234657cd9b0835ecd9c6704cbcd5369e926b1' into froyo-plus-aosp
* commit '
454234657cd9b0835ecd9c6704cbcd5369e926b1':
fix [
2594950] Flash: Zooming in on some content crashes the Nexus One and causes it to reboot (runtime restart)
Mathias Agopian [Thu, 15 Apr 2010 01:18:44 +0000 (18:18 -0700)]
Merge "fix [
2594950] Flash: Zooming in on some content crashes the Nexus One and causes it to reboot (runtime restart)" into froyo
Suchi Amalapurapu [Thu, 15 Apr 2010 01:18:29 +0000 (18:18 -0700)]
am
1e21ec92: am
40b6996a: Merge "Add ordered broadcast when removing packages." into froyo
Merge commit '
1e21ec923404a000c46590e4a87ae9ebe87e628e' into kraken
* commit '
1e21ec923404a000c46590e4a87ae9ebe87e628e':
Add ordered broadcast when removing packages.
Suchi Amalapurapu [Thu, 15 Apr 2010 01:15:31 +0000 (18:15 -0700)]
am
40b6996a: Merge "Add ordered broadcast when removing packages." into froyo
Merge commit '
40b6996a8fb7da131e8b91453b08e292723662be' into froyo-plus-aosp
* commit '
40b6996a8fb7da131e8b91453b08e292723662be':
Add ordered broadcast when removing packages.
Suchi Amalapurapu [Thu, 15 Apr 2010 01:11:34 +0000 (18:11 -0700)]
Merge "Add ordered broadcast when removing packages." into froyo
Mathias Agopian [Wed, 14 Apr 2010 23:43:44 +0000 (16:43 -0700)]
fix [
2594950] Flash: Zooming in on some content crashes the Nexus One and causes it to reboot (runtime restart)
We now limit the size of the surface to the maximum size supported by the GPU.
On Nexus One this will 2048 -- it could be different on other devices.
Surface creation fails if the limit is exceeded.
Change-Id: I9ecfc2e9c58c9e283782b61ebfc6b590f71df785
Mike Lockwood [Wed, 14 Apr 2010 23:35:29 +0000 (16:35 -0700)]
Merge "GpsLocationProvider: optimize wake lock usage." into kraken
Patrick Scott [Wed, 14 Apr 2010 23:33:44 +0000 (16:33 -0700)]
Merge branch 'kraken' of ssh://android-git:29418/platform/frameworks/base into kraken
Vasu Nori [Wed, 14 Apr 2010 23:33:32 +0000 (16:33 -0700)]
am
bad5f620: am
0bbcdc6c: Merge "verify database state before calling sqlite. Bug:
2593970" into froyo
Merge commit '
bad5f620df13ae41374e05cad0a391ab084664c4' into kraken
* commit '
bad5f620df13ae41374e05cad0a391ab084664c4':
verify database state before calling sqlite. Bug:
2593970
Grace Kloba [Wed, 14 Apr 2010 23:33:27 +0000 (16:33 -0700)]
am
e35a45b7: am
8a878dde: Merge "Pass WebKit scrollbar mode to Java. When scrollbar is alwaysOff, don\'t trigger scroll." into froyo
Merge commit '
e35a45b761ee38c04181bff0a72a6501101bf181' into kraken
* commit '
e35a45b761ee38c04181bff0a72a6501101bf181':
Pass WebKit scrollbar mode to Java. When scrollbar
Vasu Nori [Wed, 14 Apr 2010 23:27:04 +0000 (16:27 -0700)]
am
0bbcdc6c: Merge "verify database state before calling sqlite. Bug:
2593970" into froyo
Merge commit '
0bbcdc6c5f609eeb38b8f1305e529c42bf6f9a63' into froyo-plus-aosp
* commit '
0bbcdc6c5f609eeb38b8f1305e529c42bf6f9a63':
verify database state before calling sqlite. Bug:
2593970
Grace Kloba [Wed, 14 Apr 2010 23:26:55 +0000 (16:26 -0700)]
am
8a878dde: Merge "Pass WebKit scrollbar mode to Java. When scrollbar is alwaysOff, don\'t trigger scroll." into froyo
Merge commit '
8a878dde9d15f75446bb5ca3137fccef8426ddd7' into froyo-plus-aosp
* commit '
8a878dde9d15f75446bb5ca3137fccef8426ddd7':
Pass WebKit scrollbar mode to Java. When scrollbar
Vasu Nori [Wed, 14 Apr 2010 22:53:43 +0000 (15:53 -0700)]
Merge "verify database state before calling sqlite. Bug:
2593970" into froyo
Grace Kloba [Wed, 14 Apr 2010 19:44:05 +0000 (12:44 -0700)]
Merge "Pass WebKit scrollbar mode to Java. When scrollbar is alwaysOff, don't trigger scroll." into froyo
Eric Laurent [Wed, 14 Apr 2010 19:15:18 +0000 (12:15 -0700)]
am
def7db5b: am
758dd527: Fix issue
2592680: Saved ringer volume forced to 0 when receiving a call in silent mode.
Merge commit '
def7db5b79e5c178834375020ef6b590e80af42f' into kraken
* commit '
def7db5b79e5c178834375020ef6b590e80af42f':
Fix issue
2592680: Saved ringer volume forced to 0 when receiving a call in silent mode.
Daniel Sandler [Wed, 14 Apr 2010 19:15:04 +0000 (12:15 -0700)]
Merge "Missing resources for lock screen." into kraken
Eric Laurent [Wed, 14 Apr 2010 19:11:24 +0000 (12:11 -0700)]
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.
Andrei Popescu [Wed, 14 Apr 2010 19:11:21 +0000 (12:11 -0700)]
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
Dianne Hackborn [Wed, 14 Apr 2010 19:11:17 +0000 (12:11 -0700)]
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...
James Dong [Wed, 14 Apr 2010 19:11:12 +0000 (12:11 -0700)]
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
Robert Greenwalt [Wed, 14 Apr 2010 19:11:07 +0000 (12:11 -0700)]
am
57e60854: am
22b3644a: Update the datause icons.
Merge commit '
57e60854f3c7a64aad3c4178df210c6f3e98ee8b' into kraken
* commit '
57e60854f3c7a64aad3c4178df210c6f3e98ee8b':
Update the datause icons.
Robert Greenwalt [Wed, 14 Apr 2010 19:11:03 +0000 (12:11 -0700)]
am
b26c8dd4: am
9cb66e89: Merge "Perist Throttle data across reboots" into froyo
Merge commit '
b26c8dd432bf0ea8042e04e63c57913c7bd4e3d4' into kraken
* commit '
b26c8dd432bf0ea8042e04e63c57913c7bd4e3d4':
Perist Throttle data across reboots
Leon Scroggins [Wed, 14 Apr 2010 19:10:58 +0000 (12:10 -0700)]
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.
Kristian Monsen [Wed, 14 Apr 2010 19:10:53 +0000 (12:10 -0700)]
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.
Kristian Monsen [Wed, 14 Apr 2010 19:10:47 +0000 (12:10 -0700)]
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
Eric Laurent [Wed, 14 Apr 2010 19:09:52 +0000 (12:09 -0700)]
am
758dd527: Fix issue
2592680: Saved ringer volume forced to 0 when receiving a call in silent mode.
Merge commit '
758dd527f64f1e827adfe09f0141ab213733ca22' into froyo-plus-aosp
* commit '
758dd527f64f1e827adfe09f0141ab213733ca22':
Fix issue
2592680: Saved ringer volume forced to 0 when receiving a call in silent mode.
Eric Laurent [Wed, 14 Apr 2010 19:04:16 +0000 (12:04 -0700)]
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.
Andrei Popescu [Wed, 14 Apr 2010 19:04:13 +0000 (12:04 -0700)]
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
Dianne Hackborn [Wed, 14 Apr 2010 19:04:07 +0000 (12:04 -0700)]
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...
James Dong [Wed, 14 Apr 2010 19:03:53 +0000 (12:03 -0700)]
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
Robert Greenwalt [Wed, 14 Apr 2010 19:03:33 +0000 (12:03 -0700)]
am
22b3644a: Update the datause icons.
Merge commit '
22b3644ac2027d055a6b187c979ef492ee6fb082' into froyo-plus-aosp
* commit '
22b3644ac2027d055a6b187c979ef492ee6fb082':
Update the datause icons.
Robert Greenwalt [Wed, 14 Apr 2010 19:03:22 +0000 (12:03 -0700)]
am
9cb66e89: Merge "Perist Throttle data across reboots" into froyo
Merge commit '
9cb66e89cd0c4bfa8d77591719023b7153fee9b9' into froyo-plus-aosp
* commit '
9cb66e89cd0c4bfa8d77591719023b7153fee9b9':
Perist Throttle data across reboots
Leon Scroggins [Wed, 14 Apr 2010 19:02:53 +0000 (12:02 -0700)]
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.
Kristian Monsen [Wed, 14 Apr 2010 19:02:10 +0000 (12:02 -0700)]
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.
Kristian Monsen [Wed, 14 Apr 2010 19:02:01 +0000 (12:02 -0700)]
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
Eric Laurent [Wed, 14 Apr 2010 17:39:32 +0000 (10:39 -0700)]
Merge "Fix issue
2589563: Able to set ringer volume to 0 outside of silent mode." into froyo
Jean-Baptiste Queru [Wed, 14 Apr 2010 17:29:49 +0000 (10:29 -0700)]
manual merge
Change-Id: I0a81f92831dabc518cfd33b40ea93fd496a1a01c
Andrei Popescu [Wed, 14 Apr 2010 17:26:58 +0000 (10:26 -0700)]
Merge "Make sure the onended event is dispatched even when the user dismisses the video before it plays to completion." into froyo
Dianne Hackborn [Wed, 14 Apr 2010 17:16:35 +0000 (10:16 -0700)]
Merge "Fix issue #593153: Broadcast time out when sending..." into froyo
James Dong [Wed, 14 Apr 2010 16:59:33 +0000 (09:59 -0700)]
Merge "Use PV_PLAYER to handle RTSP streaming" into froyo
Robert Greenwalt [Wed, 14 Apr 2010 16:07:25 +0000 (09:07 -0700)]
Merge "Perist Throttle data across reboots" into froyo
Leon Scroggins [Wed, 14 Apr 2010 13:42:20 +0000 (06:42 -0700)]
Merge "Ensure the selection does not change in setTextAndKeepSelection." into froyo
Kristian Monsen [Wed, 14 Apr 2010 09:22:18 +0000 (02:22 -0700)]
Merge "Fix for
2585858, load invalid urls." into froyo
Kristian Monsen [Wed, 14 Apr 2010 09:22:05 +0000 (02:22 -0700)]
Merge "Fix (again) for bug
2558156, update cache encoding correctly" into froyo
Daniel Sandler [Wed, 14 Apr 2010 03:34:23 +0000 (20:34 -0700)]
Merge "Manually integrating froyo lockscreen fixes:" into kraken
Dianne Hackborn [Wed, 14 Apr 2010 01:21:45 +0000 (18:21 -0700)]
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...
Dianne Hackborn [Wed, 14 Apr 2010 01:10:35 +0000 (18:10 -0700)]
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...
Dianne Hackborn [Wed, 14 Apr 2010 01:08:17 +0000 (18:08 -0700)]
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
Dianne Hackborn [Wed, 14 Apr 2010 01:07:27 +0000 (18:07 -0700)]
Merge "Fix issue #
2555171: Switching to app immediately after unmounting..." into froyo
Dianne Hackborn [Wed, 14 Apr 2010 01:05:47 +0000 (18:05 -0700)]
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
Dianne Hackborn [Wed, 14 Apr 2010 01:02:11 +0000 (18:02 -0700)]
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...
Dianne Hackborn [Wed, 14 Apr 2010 00:59:56 +0000 (17:59 -0700)]
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...
Dianne Hackborn [Wed, 14 Apr 2010 00:57:23 +0000 (17:57 -0700)]
Merge "Fix issue #
2420340: if FLAG_SHOW_WHEN_LOCKED, do not show keyguard..." into froyo
Grace Kloba [Wed, 14 Apr 2010 00:28:17 +0000 (17:28 -0700)]
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
Grace Kloba [Wed, 14 Apr 2010 00:24:04 +0000 (17:24 -0700)]
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
Grace Kloba [Wed, 14 Apr 2010 00:20:29 +0000 (17:20 -0700)]
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