10149 Commits

Author SHA1 Message Date
Robert Greenwalt
a466ffe042 am d3bb93f6: Add build config values for data use defaults
Merge commit 'd3bb93f6870581eebbf08b5b7fb0a9c5eaad8b16' into froyo-plus-aosp

* commit 'd3bb93f6870581eebbf08b5b7fb0a9c5eaad8b16':
  Add build config values for data use defaults
2010-04-13 16:07:19 -07:00
Robert Greenwalt
d3bb93f687 Add build config values for data use defaults
Don't use hard coded defaults - use build configs instead.

Iface is now ONLY set by config so gservices doesn't need to.

bug:2576057
Change-Id: I8f9e3bc51af3b1cdf8bb4290a43197d9c01e2a14
2010-04-13 15:44:34 -07:00
Vasu Nori
c8e1f23891 verify database state before calling sqlite. Bug:2593970
Change-Id: Id68365abccbdca572ad13c2b51162d53993ff540
2010-04-13 15:05:09 -07:00
Christopher Tate
0162c3c7aa am 3643dc8c: am 3069a6da: Merge "SDK: last of the backup/restore docs content" into froyo
Merge commit '3643dc8c73bbf53c7aa6bb73d09d83c7578639e0' into kraken

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

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

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

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

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

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

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

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

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

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

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

Bug #2465360

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

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

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

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

Bug #2465360

Change-Id: Ifff60d57e4b24cee21f3a34f5f50e290d377c386
2010-04-12 15:42:16 -07:00
Christopher Tate
c47f4be6c7 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
2010-04-12 15:19:16 -07:00
Christopher Tate
7fef3c57eb 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
2010-04-12 15:16:07 -07:00
Christopher Tate
fc922f1153 API CHANGE: remove obsolete constants and hide some methods
This change removes some unused constants from BackupDataOutput
and hides a few methods that do not actually need to be exposed.

Change-Id: I47a9a107a5b58f4d53b5a2fcf9b73a765b1c5dd8
2010-04-12 14:15:37 -07:00
Patrick Scott
86cc001c9f 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.
2010-04-12 11:55:53 -07:00
Patrick Scott
c9eaa3cbb0 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.
2010-04-12 11:53:09 -07:00
Patrick Scott
36acfbc2b8 Add a bulk request method for bookmark icons.
Rather than dispatch a message for every url in the db, send a message to the
WebCoreThread to handle the query and iteration.  Update the documentation for
requestAllIcons.

Bug: 2581894
Change-Id: I8af4f87570465dff3839db4ac492883e8805b007
2010-04-12 14:26:13 -04:00
Leon Scroggins
fac110dc24 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.
2010-04-12 08:14:35 -07:00
Leon Scroggins
853a42409b 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.
2010-04-12 08:11:40 -07:00
Leon Scroggins
63284ede62 Do not check mWebTextView's focus state to determine editing mode.
Fix for bug 2568400.

Change-Id: I7e285388484bbab3aef9b6f4bb190e001266ce53
2010-04-12 10:55:39 -04:00
Kristian Monsen
ab355380f0 Fix (again) for bug 2558156, update cache encoding correctly
My fault, the last fix did not fix the issue completly. Now setting the listener so the cache item can be found when the encoding is to be set by the background worker.

Change-Id: Iea514ada9b4f52760033daee66aa29cdceda1c9e
2010-04-12 12:07:30 +01:00
Wu-cheng Li
926d9a89ed 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.
2010-04-10 11:48:24 -07:00
Dianne Hackborn
e1b462d76d 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
2010-04-10 11:48:15 -07:00
Romain Guy
50e0d9ae31 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.
2010-04-10 11:48:02 -07:00
Wei Huang
92671e5e4d 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.
2010-04-10 11:47:51 -07:00
Jesse Wilson
86b0276a39 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.
2010-04-10 11:47:45 -07:00
Robert Greenwalt
82052192c5 am 090af2c5: am 4dceedc1: Merge "Make ThrottleService notice policy changes." into froyo
Merge commit '090af2c57024b1ac0ba2ce0ecbc8e4e814c98c8b' into kraken

* commit '090af2c57024b1ac0ba2ce0ecbc8e4e814c98c8b':
  Make ThrottleService notice policy changes.
2010-04-10 11:47:35 -07:00
Dan Egnor
aeeea3da3c 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...)
2010-04-10 11:47:29 -07:00
Kristian Monsen
53f772eddb 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
2010-04-10 11:47:23 -07:00
Grace Kloba
449491ced0 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
2010-04-10 11:47:15 -07:00
Wu-cheng Li
08caa704ae 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.
2010-04-10 11:42:15 -07:00
Dianne Hackborn
06af762033 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
2010-04-10 11:42:05 -07:00
Romain Guy
376722fcdf 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.
2010-04-10 11:41:54 -07:00
Wei Huang
997b38036f 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.
2010-04-10 11:41:45 -07:00
Jesse Wilson
f9e90378d5 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.
2010-04-10 11:41:38 -07:00
Robert Greenwalt
090af2c570 am 4dceedc1: Merge "Make ThrottleService notice policy changes." into froyo
Merge commit '4dceedc133ef0487577badb67100d20473d87762' into froyo-plus-aosp

* commit '4dceedc133ef0487577badb67100d20473d87762':
  Make ThrottleService notice policy changes.
2010-04-10 11:41:25 -07:00
Dan Egnor
505f22d1a4 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...)
2010-04-10 11:41:20 -07:00
Kristian Monsen
d25fb8db8d 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
2010-04-10 11:41:14 -07:00
Grace Kloba
210462e577 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
2010-04-10 11:41:09 -07:00