OSDN Git Service
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
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
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: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 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: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
Robert Greenwalt [Tue, 13 Apr 2010 23:07:19 +0000 (16:07 -0700)]
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
James Dong [Tue, 13 Apr 2010 22:37:50 +0000 (15:37 -0700)]
am
dd684af8: Merge "Snif more 3GPP file types according to 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
James Dong [Tue, 13 Apr 2010 22:34:20 +0000 (15:34 -0700)]
Merge "Snif more 3GPP file types according to ftyps.com/3gpp.html" into froyo
Suchi Amalapurapu [Tue, 13 Apr 2010 22:32:59 +0000 (15:32 -0700)]
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
Suchi Amalapurapu [Tue, 13 Apr 2010 22:30:07 +0000 (15:30 -0700)]
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
Robert Greenwalt [Tue, 13 Apr 2010 22:25:05 +0000 (15:25 -0700)]
am
42843c3c: Merge "Fix Throttle Notification intents" into froyo
Merge commit '
42843c3ceb8b17e860112f8f2718cda40de15839' into froyo-plus-aosp
* commit '
42843c3ceb8b17e860112f8f2718cda40de15839':
Fix Throttle Notification intents
Robert Greenwalt [Tue, 13 Apr 2010 22:22:00 +0000 (15:22 -0700)]
Merge "Fix Throttle Notification intents" into froyo
Christopher Tate [Tue, 13 Apr 2010 21:24:54 +0000 (14:24 -0700)]
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
Christopher Tate [Tue, 13 Apr 2010 21:21:48 +0000 (14:21 -0700)]
Merge "SDK: last of the backup/restore docs content" into froyo
Andreas Huber [Tue, 13 Apr 2010 19:20:09 +0000 (12:20 -0700)]
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 to "-a"." into froyo
Merge commit '
db281311a0e957ba989509cf11f2085b4db12074' into froyo-plus-aosp
* commit '
db281311a0e957ba989509cf11f2085b4db12074':
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 to "-a".
Andreas Huber [Tue, 13 Apr 2010 19:16:08 +0000 (12:16 -0700)]
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 to "-a"." into froyo
James Dong [Tue, 13 Apr 2010 19:15:26 +0000 (12:15 -0700)]
am
c15f48d7: Merge "Don\'t set encoder component role while we query decoders" into froyo
Merge commit '
c15f48d7d6047f4f7d7809673fc9728b368f9b0b' into froyo-plus-aosp
* commit '
c15f48d7d6047f4f7d7809673fc9728b368f9b0b':
Don't set encoder component role while we query decoders
Grace Kloba [Tue, 13 Apr 2010 19:14:32 +0000 (12:14 -0700)]
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
James Dong [Tue, 13 Apr 2010 19:11:57 +0000 (12:11 -0700)]
Merge "Don't set encoder component role while we query decoders" into froyo
Amith Yamasani [Tue, 13 Apr 2010 17:08:10 +0000 (10:08 -0700)]
am
842d983c: Merge "Fix an upgrade bug in SettingsProvider." into froyo
Merge commit '
842d983cc3158a3de77a897d071b5b9c18dd2b55' into froyo-plus-aosp
* commit '
842d983cc3158a3de77a897d071b5b9c18dd2b55':
Fix an upgrade bug in SettingsProvider.
Amith Yamasani [Tue, 13 Apr 2010 17:05:27 +0000 (10:05 -0700)]
Merge "Fix an upgrade bug in SettingsProvider." into froyo
Jean-Michel Trivi [Tue, 13 Apr 2010 16:54:47 +0000 (09:54 -0700)]
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
Gloria Wang [Tue, 13 Apr 2010 16:54:44 +0000 (09:54 -0700)]
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.
Merge commit '
b19da8e187db1cf223463809148b7cb2d9e9751a' into froyo-plus-aosp
* commit '
b19da8e187db1cf223463809148b7cb2d9e9751a':
Fix for
2581725. Keep the last frame after resume(), and delete it
Jean-Michel Trivi [Tue, 13 Apr 2010 16:53:35 +0000 (09:53 -0700)]
Merge "Fix bug
2578813 Delay pausing music and routing audio for car docks" into froyo
Daniel Sandler [Tue, 13 Apr 2010 16:21:47 +0000 (09:21 -0700)]
am
bcac4960: Honor the "Never vibrate" setting for incoming calls.
Merge commit '
bcac496076ef6f439147e7a2be71e8a2b76ddede' into froyo-plus-aosp
* commit '
bcac496076ef6f439147e7a2be71e8a2b76ddede':
Honor the "Never vibrate" setting for incoming calls.
Daniel Sandler [Tue, 13 Apr 2010 13:05:20 +0000 (06:05 -0700)]
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.
Daniel Sandler [Tue, 13 Apr 2010 13:00:02 +0000 (06:00 -0700)]
Merge "Hide e-call button in layout." into froyo
Andreas Huber [Tue, 13 Apr 2010 00:18:43 +0000 (17:18 -0700)]
am
5baa5e19: Merge "Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don\'t have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks." into froyo
Merge commit '
5baa5e1917ba4a212fa280b8b6cc3bbbf9382194' into froyo-plus-aosp
* commit '
5baa5e1917ba4a212fa280b8b6cc3bbbf9382194':
Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don't have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks.
Andreas Huber [Tue, 13 Apr 2010 00:15:32 +0000 (17:15 -0700)]
Merge "Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don't have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks." into froyo
Christopher Tate [Mon, 12 Apr 2010 23:18:16 +0000 (16:18 -0700)]
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
Christopher Tate [Mon, 12 Apr 2010 23:14:53 +0000 (16:14 -0700)]
Merge "SDK: more backup/restore documentation work" into froyo
Scott Main [Mon, 12 Apr 2010 23:12:24 +0000 (16:12 -0700)]
am
3f371793: Merge "docs: fix bug
2590728" into froyo
Merge commit '
3f371793287b6f10badc018fb9eaca33ac51a8e7' into froyo-plus-aosp
* commit '
3f371793287b6f10badc018fb9eaca33ac51a8e7':
docs: fix bug
2590728
Scott Main [Mon, 12 Apr 2010 23:09:28 +0000 (16:09 -0700)]
Merge "docs: fix bug
2590728" into froyo
Christopher Tate [Mon, 12 Apr 2010 22:16:07 +0000 (15:16 -0700)]
am
b9e3e4ce: Merge "API CHANGE: remove obsolete constants and hide some methods" into froyo
Merge commit '
b9e3e4ce7e8e57a28ce15680d406c83cba1eb63a' into froyo-plus-aosp
* commit '
b9e3e4ce7e8e57a28ce15680d406c83cba1eb63a':
API CHANGE: remove obsolete constants and hide some methods
Christopher Tate [Mon, 12 Apr 2010 22:13:35 +0000 (15:13 -0700)]
Merge "API CHANGE: remove obsolete constants and hide some methods" into froyo
Andreas Huber [Mon, 12 Apr 2010 21:19:23 +0000 (14:19 -0700)]
am
6dbf80d0: Merge "Fix a race condition in TimedEventQueue, an event may be cancelled while we\'re waiting for its scheduled time to come in which case we\'d be removing it from the queue twice." into froyo
Merge commit '
6dbf80d086d03d95c5f6331719edd6dd6dac0361' into froyo-plus-aosp
* commit '
6dbf80d086d03d95c5f6331719edd6dd6dac0361':
Fix a race condition in TimedEventQueue, an event may be cancelled while we're waiting for its scheduled time to come in which case we'd be removing it from the queue twice.
Andreas Huber [Mon, 12 Apr 2010 21:16:34 +0000 (14:16 -0700)]
Merge "Fix a race condition in TimedEventQueue, an event may be cancelled while we're waiting for its scheduled time to come in which case we'd be removing it from the queue twice." into froyo
Kenny Root [Mon, 12 Apr 2010 19:20:50 +0000 (12:20 -0700)]
am
290a48b3: Merge "Fix typos in name of density-independent pixels" into froyo
Merge commit '
290a48b365479eccd16023b5de0d92063bb68b4d' into froyo-plus-aosp
* commit '
290a48b365479eccd16023b5de0d92063bb68b4d':
Fix typos in name of density-independent pixels
Kenny Root [Mon, 12 Apr 2010 19:19:08 +0000 (12:19 -0700)]
Merge "Fix typos in name of density-independent pixels" into froyo
Jean-Michel Trivi [Mon, 12 Apr 2010 19:07:44 +0000 (12:07 -0700)]
am
12221b6f: Merge "Fix monkey bug
2586534 java.util.ConcurrentModificationException Unlike the other audio focus and media button stack handling methods, abandonAudioFocus() and unregisterAudioFocusClient() were not synchronized around their focus stack. This CL corr
Merge commit '
12221b6f7c86349e3dcf89f814355e41f9e58cbf' into froyo-plus-aosp
* commit '
12221b6f7c86349e3dcf89f814355e41f9e58cbf':
Fix monkey bug
2586534 java.util.ConcurrentModificationException
Jean-Michel Trivi [Mon, 12 Apr 2010 19:05:08 +0000 (12:05 -0700)]
Merge "Fix monkey bug
2586534 java.util.ConcurrentModificationException Unlike the other audio focus and media button stack handling methods, abandonAudioFocus() and unregisterAudioFocusClient() were not synchronized around their focus stack. This CL corrects this." into froyo
Patrick Scott [Mon, 12 Apr 2010 18:53:09 +0000 (11:53 -0700)]
am
36acfbc2: Add a bulk request method for bookmark icons.
Merge commit '
36acfbc2b8df6e62f2d583933eca3a49265279a6' into froyo-plus-aosp
* commit '
36acfbc2b8df6e62f2d583933eca3a49265279a6':
Add a bulk request method for bookmark icons.
Andreas Huber [Mon, 12 Apr 2010 18:05:36 +0000 (11:05 -0700)]
am
1d7a8b44: Merge "Fix a case where the aac hardware decoder is in a transition state and refused a fillbuffer request." into froyo
Merge commit '
1d7a8b448e9371685894b6b02d29bcd3ae959545' into froyo-plus-aosp
* commit '
1d7a8b448e9371685894b6b02d29bcd3ae959545':
Fix a case where the aac hardware decoder is in a transition state and refused a fillbuffer request.
Andreas Huber [Mon, 12 Apr 2010 18:02:27 +0000 (11:02 -0700)]
Merge "Fix a case where the aac hardware decoder is in a transition state and refused a fillbuffer request." into froyo
Andreas Huber [Mon, 12 Apr 2010 17:14:08 +0000 (10:14 -0700)]
am
cdded187: Merge "Ignore corrupt aac audio frames and substitute silence." into froyo
Merge commit '
cdded187d20bdc6379c5a09bdd2002fa070b745d' into froyo-plus-aosp
* commit '
cdded187d20bdc6379c5a09bdd2002fa070b745d':
Ignore corrupt aac audio frames and substitute silence.
Andreas Huber [Mon, 12 Apr 2010 17:12:29 +0000 (10:12 -0700)]
am
040301ca: Start sending out buffering updates earlier (after preparation has completed) instead of only after playback has started.
Merge commit '
040301cad17e447d760e7b7e54b79c8c294415ea' into froyo-plus-aosp
* commit '
040301cad17e447d760e7b7e54b79c8c294415ea':
Start sending out buffering updates earlier (after preparation has completed) instead of only after playback has started.
Andreas Huber [Mon, 12 Apr 2010 17:11:32 +0000 (10:11 -0700)]
Merge "Ignore corrupt aac audio frames and substitute silence." into froyo
Leon Scroggins [Mon, 12 Apr 2010 15:11:40 +0000 (08:11 -0700)]
am
63284ede: Do not check mWebTextView\'s focus state to determine editing mode.
Merge commit '
63284ede623ca8a4119f1f44b86fbf017faba8dc' into froyo-plus-aosp
* commit '
63284ede623ca8a4119f1f44b86fbf017faba8dc':
Do not check mWebTextView's focus state to determine editing mode.
Wu-cheng Li [Sat, 10 Apr 2010 18:42:15 +0000 (11:42 -0700)]
am
c58b4232: Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF.
Merge commit '
c58b42327df5fbc826e2fcc2674ab6db0edfcd92' into froyo-plus-aosp
* commit '
c58b42327df5fbc826e2fcc2674ab6db0edfcd92':
Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF.
Scott Main [Sat, 10 Apr 2010 18:42:10 +0000 (11:42 -0700)]
am
2a547829: Merge "cherry-pick from master: Icf079f5f45b1745a8d54f504e28dbbb52c6f7c96 docs: rewrite resources documentation" into froyo
Merge commit '
2a547829fe162c52ea1b1168f47d25fb1b40497d' into froyo-plus-aosp
* commit '
2a547829fe162c52ea1b1168f47d25fb1b40497d':
cherry-pick from master: Icf079f5f45b1745a8d54f504e28dbbb52c6f7c96
Dianne Hackborn [Sat, 10 Apr 2010 18:42:05 +0000 (11:42 -0700)]
am
17de1532: Merge "Fix issue #
2581524: Car home icon should always go to car home" into froyo
Merge commit '
17de1532a950f7ee961debab93a7977292b7f1f3' into froyo-plus-aosp
* commit '
17de1532a950f7ee961debab93a7977292b7f1f3':
Fix issue #
2581524: Car home icon should always go to car home
Robert Greenwalt [Sat, 10 Apr 2010 18:42:02 +0000 (11:42 -0700)]
am
5cc07252: Merge "Add warning magic to be a bit more reasonable." into froyo
Merge commit '
5cc072522b51f796085a73545a3dd34a02877059' into froyo-plus-aosp
* commit '
5cc072522b51f796085a73545a3dd34a02877059':
Add warning magic to be a bit more reasonable.
Yu Shan Emily Lau [Sat, 10 Apr 2010 18:41:58 +0000 (11:41 -0700)]
am
15b02f04: Merge "Remove the checkStremingServer checking as it is unstable and introduce the flakiness." into froyo
Merge commit '
15b02f04c7b5e895dd8ebbb9448863a7d608b00f' into froyo-plus-aosp
* commit '
15b02f04c7b5e895dd8ebbb9448863a7d608b00f':
Remove the checkStremingServer checking as it is unstable and introduce the flakiness.
Romain Guy [Sat, 10 Apr 2010 18:41:54 +0000 (11:41 -0700)]
am
4525c981: Merge "Fix regression introduced when fixing focus issue with ScrollView. Bug #
2581646" into froyo
Merge commit '
4525c98114c1e570ecef84521f66095e866af77d' into froyo-plus-aosp
* commit '
4525c98114c1e570ecef84521f66095e866af77d':
Fix regression introduced when fixing focus issue with ScrollView.
Wink Saville [Sat, 10 Apr 2010 18:41:50 +0000 (11:41 -0700)]
am
a18c824c: Merge "Fix a FATAL ClassCastException in DataConnection.java" into froyo
Merge commit '
a18c824c029c14093b3d06d0a021c5397be667fb' into froyo-plus-aosp
* commit '
a18c824c029c14093b3d06d0a021c5397be667fb':
Fix a FATAL ClassCastException in DataConnection.java
Wei Huang [Sat, 10 Apr 2010 18:41:45 +0000 (11:41 -0700)]
am
c621b65d: Merge "bug #
2542580: add the appropriate mdpi asset for chat icon." into froyo
Merge commit '
c621b65d2f4ac88174fb98d2ed9a6b0d06fde4da' into froyo-plus-aosp
* commit '
c621b65d2f4ac88174fb98d2ed9a6b0d06fde4da':
bug #
2542580: add the appropriate mdpi asset for chat icon.
Jesse Wilson [Sat, 10 Apr 2010 18:41:38 +0000 (11:41 -0700)]
am
bc284a5f: Merge "Move the public method HttpDateTime.parse() into AndroidHttpClient." into froyo
Merge commit '
bc284a5f9f1e3f19ddd45cfb233f0d1775b612a7' into froyo-plus-aosp
* commit '
bc284a5f9f1e3f19ddd45cfb233f0d1775b612a7':
Move the public method HttpDateTime.parse() into AndroidHttpClient.
Mike Reed [Sat, 10 Apr 2010 18:41:30 +0000 (11:41 -0700)]
am
a3c4c219: Merge "final versions of these fonts from ascender, including GPOS \'mark\' feature" into froyo
Merge commit '
a3c4c219c21e61ca4a642a35610dea07c437a647' into froyo-plus-aosp
* commit '
a3c4c219c21e61ca4a642a35610dea07c437a647':
final versions of these fonts from ascender, including GPOS 'mark' feature
Robert Greenwalt [Sat, 10 Apr 2010 18:41:25 +0000 (11:41 -0700)]
am
4dceedc1: Merge "Make ThrottleService notice policy changes." into froyo
Merge commit '
4dceedc133ef0487577badb67100d20473d87762' into froyo-plus-aosp
* commit '
4dceedc133ef0487577badb67100d20473d87762':
Make ThrottleService notice policy changes.
Dan Egnor [Sat, 10 Apr 2010 18:41:20 +0000 (11:41 -0700)]
am
2d3df559: Merge "Fix sim build (sim doesn\'t have strl*() reliably...)" into froyo
Merge commit '
2d3df559dea9ebb0ab263c2df26e8a345ed74d12' into froyo-plus-aosp
* commit '
2d3df559dea9ebb0ab263c2df26e8a345ed74d12':
Fix sim build (sim doesn't have strl*() reliably...)
Kristian Monsen [Sat, 10 Apr 2010 18:41:14 +0000 (11:41 -0700)]
am
34959e3f: Merge "Do not create intents for application/xhtml+xml" into froyo
Merge commit '
34959e3fe87012d554af07fd6ad294b2ce3daea7' into froyo-plus-aosp
* commit '
34959e3fe87012d554af07fd6ad294b2ce3daea7':
Do not create intents for application/xhtml+xml
Grace Kloba [Sat, 10 Apr 2010 18:41:09 +0000 (11:41 -0700)]
am
e67e6b94: Merge "Set mHeldMotionless to a new MOTIONLESS_IGNORE state for fling, this way we will trigger animateScroll during fling for the faster performance. We also avoid keep removing/sending DRAG_HELD_MOTIONLESS message during fling." into froyo
Merge commit '
e67e6b94fd282283f1ffa2299fae536bee099715' into froyo-plus-aosp
* commit '
e67e6b94fd282283f1ffa2299fae536bee099715':
Set mHeldMotionless to a new MOTIONLESS_IGNORE state
Scott Main [Sat, 10 Apr 2010 00:03:55 +0000 (17:03 -0700)]
Merge "cherry-pick from master: Icf079f5f45b1745a8d54f504e28dbbb52c6f7c96 docs: rewrite resources documentation" into froyo
Dianne Hackborn [Fri, 9 Apr 2010 23:52:41 +0000 (16:52 -0700)]
Merge "Fix issue #
2581524: Car home icon should always go to car home" into froyo
Robert Greenwalt [Fri, 9 Apr 2010 23:47:10 +0000 (16:47 -0700)]
Merge "Add warning magic to be a bit more reasonable." into froyo
Yu Shan Emily Lau [Fri, 9 Apr 2010 23:41:37 +0000 (16:41 -0700)]
Merge "Remove the checkStremingServer checking as it is unstable and introduce the flakiness." into froyo
Romain Guy [Fri, 9 Apr 2010 23:08:17 +0000 (16:08 -0700)]
Merge "Fix regression introduced when fixing focus issue with ScrollView. Bug #
2581646" into froyo
Wink Saville [Fri, 9 Apr 2010 22:39:33 +0000 (15:39 -0700)]
Merge "Fix a FATAL ClassCastException in DataConnection.java" into froyo
Wei Huang [Fri, 9 Apr 2010 22:34:46 +0000 (15:34 -0700)]
Merge "bug #
2542580: add the appropriate mdpi asset for chat icon." into froyo
Jesse Wilson [Fri, 9 Apr 2010 21:01:07 +0000 (14:01 -0700)]
Merge "Move the public method HttpDateTime.parse() into AndroidHttpClient." into froyo
Jesse Wilson [Thu, 8 Apr 2010 21:20:57 +0000 (14:20 -0700)]
Move the public method HttpDateTime.parse() into AndroidHttpClient.
See bug http://b/
2553589
Change-Id: Ide3399c7c63daf9c0b8c18669076f2f4d6e9a876
Mike Reed [Fri, 9 Apr 2010 20:10:07 +0000 (13:10 -0700)]
Merge "final versions of these fonts from ascender, including GPOS 'mark' feature" into froyo
Robert Greenwalt [Fri, 9 Apr 2010 20:00:05 +0000 (13:00 -0700)]
Merge "Make ThrottleService notice policy changes." into froyo
Dan Egnor [Fri, 9 Apr 2010 19:50:11 +0000 (12:50 -0700)]
Merge "Fix sim build (sim doesn't have strl*() reliably...)" into froyo
Kristian Monsen [Fri, 9 Apr 2010 17:59:20 +0000 (10:59 -0700)]
Merge "Do not create intents for application/xhtml+xml" into froyo
Grace Kloba [Fri, 9 Apr 2010 17:49:42 +0000 (10:49 -0700)]
Merge "Set mHeldMotionless to a new MOTIONLESS_IGNORE state for fling, this way we will trigger animateScroll during fling for the faster performance. We also avoid keep removing/sending DRAG_HELD_MOTIONLESS message during fling." into froyo
Robert Greenwalt [Fri, 9 Apr 2010 16:32:03 +0000 (09:32 -0700)]
am
cb270410: Merge "Roaming data doesn\'t count against limits" into froyo
Merge commit '
cb27041034343a6a15f0812d04f66fefbed30686' into froyo-plus-aosp
* commit '
cb27041034343a6a15f0812d04f66fefbed30686':
Roaming data doesn't count against limits
Robert Greenwalt [Fri, 9 Apr 2010 16:29:20 +0000 (09:29 -0700)]
Merge "Roaming data doesn't count against limits" into froyo
Eric Laurent [Fri, 9 Apr 2010 15:53:08 +0000 (08:53 -0700)]
am
9da7730d: Merge "Additional fix for isssue
2548710: Native AudioTrack resources never freed." into froyo
Merge commit '
9da7730d5f97270c356ee86298c5d6d45f39b264' into froyo-plus-aosp
* commit '
9da7730d5f97270c356ee86298c5d6d45f39b264':
Additional fix for isssue
2548710: Native AudioTrack resources never freed.
Eric Laurent [Fri, 9 Apr 2010 15:48:32 +0000 (08:48 -0700)]
Merge "Additional fix for isssue
2548710: Native AudioTrack resources never freed." into froyo
OSDN Git Service
