OSDN Git Service
Grace Kloba [Tue, 13 Apr 2010 19:20:35 +0000 (12:20 -0700)]
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
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
Amith Yamasani [Tue, 13 Apr 2010 18:54:04 +0000 (11:54 -0700)]
am
feb976e6: am
842d983c: Merge "Fix an upgrade bug in SettingsProvider." into froyo
Merge commit '
feb976e6be3a07dd31b35b35287420bba9ffbbf3' into kraken
* commit '
feb976e6be3a07dd31b35b35287420bba9ffbbf3':
Fix an upgrade bug in SettingsProvider.
Jean-Michel Trivi [Tue, 13 Apr 2010 18:53:57 +0000 (11:53 -0700)]
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
Gloria Wang [Tue, 13 Apr 2010 18:53:52 +0000 (11:53 -0700)]
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.
Merge commit '
d4c072d3f584db2cf9214c9d813c15d9e646c527' into kraken
* commit '
d4c072d3f584db2cf9214c9d813c15d9e646c527':
Fix for
2581725. Keep the last frame after resume(), and delete it
Daniel Sandler [Tue, 13 Apr 2010 18:53:30 +0000 (11:53 -0700)]
am
de3601e0: am
bcac4960: Honor the "Never vibrate" setting for incoming calls.
Merge commit '
de3601e05cf551e24eee50d4c1e70b5037792679' into kraken
* commit '
de3601e05cf551e24eee50d4c1e70b5037792679':
Honor the "Never vibrate" setting for incoming calls.
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:10:10 +0000 (06:10 -0700)]
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.
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
Mathias Agopian [Tue, 13 Apr 2010 01:59:49 +0000 (18:59 -0700)]
Merge "don't hardcode "mSurface" throughout our source code" into kraken
Andreas Huber [Tue, 13 Apr 2010 00:21:33 +0000 (17:21 -0700)]
am
248ea4a9: 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 '
248ea4a9f773210a7b7dbd7892e6b865a0f7add3' into kraken
* commit '
248ea4a9f773210a7b7dbd7892e6b865a0f7add3':
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: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
Mathias Agopian [Mon, 12 Apr 2010 23:22:15 +0000 (16:22 -0700)]
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
Christopher Tate [Mon, 12 Apr 2010 23:23:35 +0000 (16:23 -0700)]
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
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
Scott Main [Mon, 12 Apr 2010 23:15:42 +0000 (16:15 -0700)]
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:19:16 +0000 (15:19 -0700)]
am
7fef3c57: am
b9e3e4ce: Merge "API CHANGE: remove obsolete constants and hide some methods" into froyo
Merge commit '
7fef3c57eb6f5fbef65dd553ea49d93111d595da' into kraken
* commit '
7fef3c57eb6f5fbef65dd553ea49d93111d595da':
API CHANGE: remove obsolete constants and hide some methods
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:23:31 +0000 (14:23 -0700)]
am
98c5bd55: 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 '
98c5bd5556f32a237d3483fb7298284869e32a40' into kraken
* commit '
98c5bd5556f32a237d3483fb7298284869e32a40':
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: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:24:51 +0000 (12:24 -0700)]
am
5b0fb521: am
290a48b3: Merge "Fix typos in name of density-independent pixels" into froyo
Merge commit '
5b0fb521e6af1ca61141daa3d86f97fd6343f5e4' into kraken
* commit '
5b0fb521e6af1ca61141daa3d86f97fd6343f5e4':
Fix typos in name of density-independent pixels
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:11:54 +0000 (12:11 -0700)]
am
54419a4f: 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.
Merge commit '
54419a4fc908eab8408f39f3eae97c4315135d84' into kraken
* commit '
54419a4fc908eab8408f39f3eae97c4315135d84':
Fix monkey bug
2586534 java.util.ConcurrentModificationException
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:55:53 +0000 (11:55 -0700)]
am
c9eaa3cb: am
36acfbc2: Add a bulk request method for bookmark icons.
Merge commit '
c9eaa3cbb0d6152cd156a9e66ef23389042b48b5' into kraken
* commit '
c9eaa3cbb0d6152cd156a9e66ef23389042b48b5':
Add a bulk request method for bookmark icons.
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:07:54 +0000 (11:07 -0700)]
am
f0a49f68: 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 '
f0a49f68f0edc98fefbe14e3ddcf0d6853519293' into kraken
* commit '
f0a49f68f0edc98fefbe14e3ddcf0d6853519293':
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: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:05:22 +0000 (11:05 -0700)]
Merge "I accidentally broken passion encoding while working around problems with the sholes encoder." into kraken
Andreas Huber [Mon, 12 Apr 2010 18:05:09 +0000 (11:05 -0700)]
Merge "Remove unnecessary lock from AMRWriter." into kraken
Andreas Huber [Mon, 12 Apr 2010 18:04:57 +0000 (11:04 -0700)]
Merge "Various fixes to enable recording on passion and nexus1." into kraken
Andreas Huber [Mon, 12 Apr 2010 18:04:46 +0000 (11:04 -0700)]
Merge "Remove legacy NO_OPENCORE code bypass from MediaPlayerService." into kraken
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:16:11 +0000 (10:16 -0700)]
am
10d40772: am
cdded187: Merge "Ignore corrupt aac audio frames and substitute silence." into froyo
Merge commit '
10d4077240fe17b3a0c0e16a6e3f9d5e66419ba0' into kraken
* commit '
10d4077240fe17b3a0c0e16a6e3f9d5e66419ba0':
Ignore corrupt aac audio frames and substitute silence.
Andreas Huber [Mon, 12 Apr 2010 17:16:08 +0000 (10:16 -0700)]
am
b1e7bee2: am
040301ca: Start sending out buffering updates earlier (after preparation has completed) instead of only after playback has started.
Merge commit '
b1e7bee2f3537bf5c49d1de796a97d2c2a48ebd4' into kraken
* commit '
b1e7bee2f3537bf5c49d1de796a97d2c2a48ebd4':
Start sending out buffering updates earlier (after preparation has completed) instead of only after playback has started.
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:14:35 +0000 (08:14 -0700)]
am
853a4240: am
63284ede: Do not check mWebTextView\'s focus state to determine editing mode.
Merge commit '
853a42409b34b3aff118c7a09e390477247d002b' into kraken
* commit '
853a42409b34b3aff118c7a09e390477247d002b':
Do not check mWebTextView's focus state to determine editing mode.
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:48:24 +0000 (11:48 -0700)]
am
08caa704: am
c58b4232: Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF.
Merge commit '
08caa704ae6c1dd8434186fa2dc22b1d7f8a5f9c' into kraken
* commit '
08caa704ae6c1dd8434186fa2dc22b1d7f8a5f9c':
Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF.
Scott Main [Sat, 10 Apr 2010 18:48:20 +0000 (11:48 -0700)]
am
67d6590d: am
2a547829: Merge "cherry-pick from master: Icf079f5f45b1745a8d54f504e28dbbb52c6f7c96 docs: rewrite resources documentation" into froyo
Merge commit '
67d6590d242397acbb95814139301d2e6efd3631' into kraken
* commit '
67d6590d242397acbb95814139301d2e6efd3631':
cherry-pick from master: Icf079f5f45b1745a8d54f504e28dbbb52c6f7c96
Dianne Hackborn [Sat, 10 Apr 2010 18:48:15 +0000 (11:48 -0700)]
am
06af7620: am
17de1532: Merge "Fix issue #
2581524: Car home icon should always go to car home" into froyo
Merge commit '
06af762033467bb578b9ed2be8af580cc11505a8' into kraken
* commit '
06af762033467bb578b9ed2be8af580cc11505a8':
Fix issue #
2581524: Car home icon should always go to car home
Robert Greenwalt [Sat, 10 Apr 2010 18:48:11 +0000 (11:48 -0700)]
am
52ebff3c: am
5cc07252: Merge "Add warning magic to be a bit more reasonable." into froyo
Merge commit '
52ebff3c47eb3fcd43d0337a43312240f7d2010e' into kraken
* commit '
52ebff3c47eb3fcd43d0337a43312240f7d2010e':
Add warning magic to be a bit more reasonable.
Yu Shan Emily Lau [Sat, 10 Apr 2010 18:48:06 +0000 (11:48 -0700)]
am
6e40664f: am
15b02f04: Merge "Remove the checkStremingServer checking as it is unstable and introduce the flakiness." into froyo
Merge commit '
6e40664fc75e25ebeafda883fc2bba27279bebdd' into kraken
* commit '
6e40664fc75e25ebeafda883fc2bba27279bebdd':
Remove the checkStremingServer checking as it is unstable and introduce the flakiness.
Romain Guy [Sat, 10 Apr 2010 18:48:02 +0000 (11:48 -0700)]
am
376722fc: am
4525c981: Merge "Fix regression introduced when fixing focus issue with ScrollView. Bug #
2581646" into froyo
Merge commit '
376722fcdf41ade7286bcdb757564559d35a4976' into kraken
* commit '
376722fcdf41ade7286bcdb757564559d35a4976':
Fix regression introduced when fixing focus issue with ScrollView.
Wink Saville [Sat, 10 Apr 2010 18:47:57 +0000 (11:47 -0700)]
am
19fe70cb: am
a18c824c: Merge "Fix a FATAL ClassCastException in DataConnection.java" into froyo
Merge commit '
19fe70cbe70615d2d639fec2a2a3ab35d00d43ef' into kraken
* commit '
19fe70cbe70615d2d639fec2a2a3ab35d00d43ef':
Fix a FATAL ClassCastException in DataConnection.java
Wei Huang [Sat, 10 Apr 2010 18:47:51 +0000 (11:47 -0700)]
am
997b3803: am
c621b65d: Merge "bug #
2542580: add the appropriate mdpi asset for chat icon." into froyo
Merge commit '
997b38036f5ac5db69191d090c8c3c1d1b05aace' into kraken
* commit '
997b38036f5ac5db69191d090c8c3c1d1b05aace':
bug #
2542580: add the appropriate mdpi asset for chat icon.
Jesse Wilson [Sat, 10 Apr 2010 18:47:45 +0000 (11:47 -0700)]
am
f9e90378: am
bc284a5f: Merge "Move the public method HttpDateTime.parse() into AndroidHttpClient." into froyo
Merge commit '
f9e90378d50210298d1cec2b913653597cd62be4' into kraken
* commit '
f9e90378d50210298d1cec2b913653597cd62be4':
Move the public method HttpDateTime.parse() into AndroidHttpClient.
Mike Reed [Sat, 10 Apr 2010 18:47:40 +0000 (11:47 -0700)]
am
58d50183: am
a3c4c219: Merge "final versions of these fonts from ascender, including GPOS \'mark\' feature" into froyo
Merge commit '
58d50183bc7c125db76f5ca8f76816ebb9f19d17' into kraken
* commit '
58d50183bc7c125db76f5ca8f76816ebb9f19d17':
final versions of these fonts from ascender, including GPOS 'mark' feature
Robert Greenwalt [Sat, 10 Apr 2010 18:47:35 +0000 (11:47 -0700)]
am
090af2c5: am
4dceedc1: Merge "Make ThrottleService notice policy changes." into froyo
Merge commit '
090af2c57024b1ac0ba2ce0ecbc8e4e814c98c8b' into kraken
* commit '
090af2c57024b1ac0ba2ce0ecbc8e4e814c98c8b':
Make ThrottleService notice policy changes.
Dan Egnor [Sat, 10 Apr 2010 18:47:29 +0000 (11:47 -0700)]
am
505f22d1: am
2d3df559: Merge "Fix sim build (sim doesn\'t have strl*() reliably...)" into froyo
Merge commit '
505f22d1a4dbf1fceaf8deca443d7322386964e1' into kraken
* commit '
505f22d1a4dbf1fceaf8deca443d7322386964e1':
Fix sim build (sim doesn't have strl*() reliably...)
Kristian Monsen [Sat, 10 Apr 2010 18:47:23 +0000 (11:47 -0700)]
am
d25fb8db: am
34959e3f: Merge "Do not create intents for application/xhtml+xml" into froyo
Merge commit '
d25fb8db8de213feb55cdfff087eabc6ee865f31' into kraken
* commit '
d25fb8db8de213feb55cdfff087eabc6ee865f31':
Do not create intents for application/xhtml+xml
Grace Kloba [Sat, 10 Apr 2010 18:47:15 +0000 (11:47 -0700)]
am
210462e5: 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 '
210462e57762be9bb016b4d05374cae5f48b5aea' into kraken
* commit '
210462e57762be9bb016b4d05374cae5f48b5aea':
Set mHeldMotionless to a new MOTIONLESS_IGNORE state
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
Mathias Agopian [Fri, 9 Apr 2010 21:28:03 +0000 (14:28 -0700)]
Merge "small cleanup. gEGLImpl should have been static" into kraken
Mathias Agopian [Fri, 9 Apr 2010 20:37:34 +0000 (13:37 -0700)]
small cleanup. gEGLImpl should have been static
also added a ctor to initialized it in case we use it ont he stack
one day.
Change-Id: I2736b9bce3d8ba3b74fd029de4c18cca2cdbbf60
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:35:55 +0000 (09:35 -0700)]
am
a68780dd: am
cb270410: Merge "Roaming data doesn\'t count against limits" into froyo
Merge commit '
a68780dd0f0af0938b72fdf6539db575da471028' into kraken
* commit '
a68780dd0f0af0938b72fdf6539db575da471028':
Roaming data doesn't count against limits
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