4543 Commits

Author SHA1 Message Date
Bjorn Bringert
832d627a18 am 38325cb2: am 95c98dd5: Merge change Ie69a9c0a into eclair
Merge commit '38325cb2d9c221691f37786a122e84043b5bcb90'

* commit '38325cb2d9c221691f37786a122e84043b5bcb90':
  Remove globalSearch argument from triggerSearch()
2009-10-01 13:59:48 -07:00
Grace Kloba
baf04c082e am ad433430: am 00f60363: Merge change I2919f492 into eclair
Merge commit 'ad433430126bec9a1361dd857635aa494d3d6a10'

* commit 'ad433430126bec9a1361dd857635aa494d3d6a10':
  remove cert for SampleBrowserPlugin and only check
2009-10-01 13:55:11 -07:00
Dianne Hackborn
b13d0a311d am 41829e01: am e88846ee: Semi-workaround for #2027266: app drawer showing up on the side of the screen
Merge commit '41829e0138dbf3c3334eb3ca3bfcc08a26871f39'

* commit '41829e0138dbf3c3334eb3ca3bfcc08a26871f39':
  Semi-workaround for #2027266: app drawer showing up on the side of the screen
2009-10-01 13:54:45 -07:00
Dianne Hackborn
df197471cc am 943c8e7d: am 29e4a3c5: Update from API review.
Merge commit '943c8e7de682eb0d55167fe4c434e9f1c532a5ae'

* commit '943c8e7de682eb0d55167fe4c434e9f1c532a5ae':
  Update from API review.
2009-10-01 13:53:46 -07:00
Jim Miller
2a598aae27 am d42a7152: am d9b6f14a: Adjust opacity for inactive dimple in rotary widget
Merge commit 'd42a7152aa7b0673df6c8a13a8fc50e137aca70f'

* commit 'd42a7152aa7b0673df6c8a13a8fc50e137aca70f':
  Adjust opacity for inactive dimple in rotary widget
2009-10-01 13:53:27 -07:00
Evan Millar
6b81de4cd6 am cbbfd38f: am 9901e38a: Merge change I7a39c564 into eclair
Merge commit 'cbbfd38fc581a8b2d64faa898e5ac7fb924b3d95'

* commit 'cbbfd38fc581a8b2d64faa898e5ac7fb924b3d95':
  Fix docs error
2009-10-01 13:52:03 -07:00
Robert Greenwalt
0e626cfb7b am 14123084: am a1323c77: Merge change Iaf08eabc into eclair
Merge commit '1412308467116347e0443117b358c63da103774f'

* commit '1412308467116347e0443117b358c63da103774f':
  Reduce the ConnectivityManager logging.
2009-10-01 13:51:35 -07:00
Ray Chen
6a1262e210 am a6715ca6: am f09edd60: Merge change Id60fa26a into eclair
Merge commit 'a6715ca6f9e2125f2ea5db5cf71714e75618e9fa'

* commit 'a6715ca6f9e2125f2ea5db5cf71714e75618e9fa':
  Fix issue 2152541	thumbnail images stretched.
2009-10-01 13:51:07 -07:00
Evan Millar
8c341cc524 am 65114403: am 5042f7ea: Unhide ContactsContract#QuickContact and fix sdk build
Merge commit '65114403bf947b04804d846b9fd67e85a57b933b'

* commit '65114403bf947b04804d846b9fd67e85a57b933b':
  Unhide ContactsContract#QuickContact and fix sdk build
2009-10-01 13:50:18 -07:00
Grace Kloba
751b628bca am ff9af3f3: am 9d33d953: Merge change I07729abd into eclair
Merge commit 'ff9af3f3ee0300e9aee93435008cfb62d5bee600'

* commit 'ff9af3f3ee0300e9aee93435008cfb62d5bee600':
  Keep the scrollbar on during TOUCH_MOVE events even
2009-10-01 13:49:01 -07:00
Fred Quintana
4ed8d41308 am d5aa6028: am c868acf4: show events in the UI
Merge commit 'd5aa602861f154629960a285422819092b63ae7b'

* commit 'd5aa602861f154629960a285422819092b63ae7b':
  show events in the UI
2009-10-01 13:48:40 -07:00
Jaikumar Ganesh
0865a3adf9 am eff77e9a: am 8ad6d524: Merge change I55e15bad into eclair
Merge commit 'eff77e9a92c40d501f42b1774752b07d4e5141a7'

* commit 'eff77e9a92c40d501f42b1774752b07d4e5141a7':
  Try to reconnect twice when the rfcomm error code is Connection Refused.
2009-10-01 13:45:43 -07:00
Evan Millar
bc47f71e24 am eebbe04f: am 35de7ef8: Merge change I98f2db38 into eclair
Merge commit 'eebbe04fdca964afaa294bad1c3ed7a68dd1d938'

* commit 'eebbe04fdca964afaa294bad1c3ed7a68dd1d938':
  FastTrack->QuickContact
2009-10-01 13:45:20 -07:00
Grace Kloba
7945d97f96 am 271fcd4a: am ade1aacf: Merge change Ic88b39e6 into eclair
Merge commit '271fcd4ac9f2149ad1c25ae0bab6393677d5a032'

* commit '271fcd4ac9f2149ad1c25ae0bab6393677d5a032':
  Add the signature checking for WebView plugins. The
2009-10-01 13:44:34 -07:00
Wu-cheng Li
1abcddcb9a am 2b3489dd: am 5e5001bc: Merge change I7ed72bf5 into eclair
Merge commit '2b3489ddad289387a68955fbfaa37461b4d8a911'

* commit '2b3489ddad289387a68955fbfaa37461b4d8a911':
  Add documentation for scene mode. Other parameters may be changed after setting scene mode.
2009-10-01 13:43:54 -07:00
Eric Fischer
7b716f39d1 am 1dc38caf: am 88f2acb0: Merge change Iec1f8a2e into eclair
Merge commit '1dc38caf5fe5b479f50518b60e24c3c1df804dbf'

* commit '1dc38caf5fe5b479f50518b60e24c3c1df804dbf':
  Add Turkish accented letters for G and S on the hard keyboard.
2009-10-01 13:42:54 -07:00
Jaikumar Ganesh
728f3e5401 am d709d382: am 4c9a29ef: Set Sink State when ACL disconnects.
Merge commit 'd709d3820586e858bab6cb8dad0c87e0f0689258'

* commit 'd709d3820586e858bab6cb8dad0c87e0f0689258':
  Set Sink State when ACL disconnects.
2009-10-01 13:42:16 -07:00
Christopher Tate
4cbcab985c am 6678aecc: am 436344ae: Turn off most of the backup-related debug logging
Merge commit '6678aeccec58f5ff306fb93ad4411208ed6227db'

* commit '6678aeccec58f5ff306fb93ad4411208ed6227db':
  Turn off most of the backup-related debug logging
2009-10-01 13:40:57 -07:00
Leon Scroggins
95fbbbf165 am 782d690f: am 10be7542: If the textfield is offscreen at the end of a zoom, remove it.
Merge commit '782d690fbdf79ff7e2c30e86a3639e4d025ade47'

* commit '782d690fbdf79ff7e2c30e86a3639e4d025ade47':
  If the textfield is offscreen at the end of a zoom, remove it.
2009-10-01 13:40:19 -07:00
Nick Pelly
3053941019 am 05c77647: am 78128d72: Merge change I2782ac8c into eclair
Merge commit '05c776477c1daac5ca53f8e3e39868555d0dedab'

* commit '05c776477c1daac5ca53f8e3e39868555d0dedab':
  Fix regression.
2009-10-01 12:23:25 -07:00
Suchi Amalapurapu
4b7b70dae4 am 7a51b14d: am 094e3e0b: Merge change Icb89d482 into eclair
Merge commit '7a51b14d9f7f8c48c74ed1787bed3ef83aae6658'

* commit '7a51b14d9f7f8c48c74ed1787bed3ef83aae6658':
  Check if rename of backed up file fails before persisting new changes.
2009-10-01 12:23:14 -07:00
Jaikumar Ganesh
e6e8dfac35 am 9d2dc89c: am b392c53f: Merge change Iba6fd660 into eclair
Merge commit '9d2dc89cc32cfc768df390278fe18b72b868a718'

* commit '9d2dc89cc32cfc768df390278fe18b72b868a718':
  Set BondState to Bonding only if it not Bonded already.
2009-10-01 12:22:21 -07:00
Dianne Hackborn
dffcf5eae9 am e67de076: am a33e3f79: Fix issue #2154794: Force close when start facebook application.
Merge commit 'e67de07627e5a35e499eeefdfb0334b50590d053'

* commit 'e67de07627e5a35e499eeefdfb0334b50590d053':
  Fix issue #2154794: Force close when start facebook application.
2009-10-01 12:21:26 -07:00
Dianne Hackborn
1e17eb3677 am 04e8a925: am 935cbda0: Merge change I174d16a3 into eclair
Merge commit '04e8a925c00ef0a1bf58932b84253ed72daf8404'

* commit '04e8a925c00ef0a1bf58932b84253ed72daf8404':
  Debugging for #2027266: app drawer showing up on the side
2009-10-01 12:19:59 -07:00
Scott Main
621ab2a0e6 am 3f8e158a: am d2c494d9: Merge change I8b2e000c into eclair
Merge commit '3f8e158a9dd27cc4c02be4e55fd51670563217d5'

* commit '3f8e158a9dd27cc4c02be4e55fd51670563217d5':
  add class description and revise descriptions for
2009-10-01 12:19:48 -07:00
Daisuke Miyakawa
276fff813f am dfe07a85: am 0100fae1: Merge change I1f7c409e into eclair
Merge commit 'dfe07a850b1125f660cf8c73fdbf0a18df4f58e4'

* commit 'dfe07a850b1125f660cf8c73fdbf0a18df4f58e4':
  Make ContactStruct handle Collection properly.
2009-10-01 12:19:15 -07:00
Amith Yamasani
051713404c am e092e1f5: am 17d262f2: Merge change I69220990 into eclair
Merge commit 'e092e1f531de1fc2985b83c9ec6ff40551e148f0'

* commit 'e092e1f531de1fc2985b83c9ec6ff40551e148f0':
  Fix for 2155255: Revert "Cache inflated view to avoid inflation of layouts in preferences"
2009-10-01 12:19:03 -07:00
Megha Joshi
2c80ecd49a am e8501c84: am 523db1c3: Merge change Icf1e2f98 into eclair
Merge commit 'e8501c84f8f7a1d0165c127475a1a6c7499c8c64'

* commit 'e8501c84f8f7a1d0165c127475a1a6c7499c8c64':
  Adds Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET to launch fasttrack intent.
2009-10-01 12:18:40 -07:00
Romain Guy
7174f15fd7 am 2fbdbb65: am 5392556b: Merge change I5910a70c into eclair
Merge commit '2fbdbb657a1ae591fc69821675124b1fbe6f06c5'

* commit '2fbdbb657a1ae591fc69821675124b1fbe6f06c5':
  Fix documentation.
2009-10-01 12:17:12 -07:00
Andrei Popescu
9af8374e09 am 5b95f833: am 486733c1: Merge change I94856f6d into eclair
Merge commit '5b95f83356f130e138f3e9a26a1580c479eb955d'

* commit '5b95f83356f130e138f3e9a26a1580c479eb955d':
  Update <video> implementation after new IRC discussion with Eric Carlsson.
2009-10-01 12:16:14 -07:00
Romain Guy
d41d29a370 am 7c749f81: am 27d8514f: Merge change I78f113bc into eclair
Merge commit '7c749f81a64f8778af66429dd041fafcce32e503'

* commit '7c749f81a64f8778af66429dd041fafcce32e503':
  Fix possible crash in AutoCompleteTextView.
2009-10-01 12:15:55 -07:00
Nick Pelly
34714f24c9 am 83f86de3: am 285f2422: Merge change I28bad882 into eclair
Merge commit '83f86de3de60ea24462a0e04a09ddb4a435966c9'

* commit '83f86de3de60ea24462a0e04a09ddb4a435966c9':
  Fix broken build.
2009-10-01 12:15:14 -07:00
Amith Yamasani
b9174e0239 am 2fe7c9e5: am 86aece8b: Merge change I8dfd6ea8 into eclair
Merge commit '2fe7c9e51a5dd29be011fa618e74ad2c79b0d42d'

* commit '2fe7c9e51a5dd29be011fa618e74ad2c79b0d42d':
  Handle bad lines in /proc/wakelocks : Fix for 2124260
2009-10-01 12:14:46 -07:00
Evan Millar
b6fc6f225a am 09aa95bf: am 1537a255: Merge change I46a6d39c into eclair
Merge commit '09aa95bff32f5bc965bec63cd70443c1c0ff145d'

* commit '09aa95bff32f5bc965bec63cd70443c1c0ff145d':
  Remove unused api in QuickContact.java and fix the build.
2009-10-01 12:14:35 -07:00
Daisuke Miyakawa
832fa33955 am 367e1af2: am 255d51cc: Merge change Ia6fc04c8 into eclair
Merge commit '367e1af28754dd952a8da6f262c41dc5004c2366'

* commit '367e1af28754dd952a8da6f262c41dc5004c2366':
  Remove android.syncml package completely.
2009-10-01 12:14:07 -07:00
Zhu Lan
e7b2d93f22 am ba61cff4: am e5661c40: Merge change I8366852f into eclair
Merge commit 'ba61cff482a048131937d82f0d9652c799383314'

* commit 'ba61cff482a048131937d82f0d9652c799383314':
  Bluetooth A2DP suspend/resume functionality
2009-10-01 12:13:57 -07:00
Daisuke Miyakawa
825af8cb2c am ee1a41d0: am 85d86af9: Merge change I82be558f into eclair
Merge commit 'ee1a41d00adab64cd426d13d72551f28077adaff'

* commit 'ee1a41d00adab64cd426d13d72551f28077adaff':
  Fix vCard composer in three points.
2009-10-01 12:12:34 -07:00
Fred Quintana
c8735f183a am 32a702a7: am 609c2c08: Merge change Ia54b1bf0 into eclair
Merge commit '32a702a7a8a328a7080c18fd65478caf82d86e0e'

* commit '32a702a7a8a328a7080c18fd65478caf82d86e0e':
  - make SyncManager get the accounts list during the constructor,
2009-10-01 12:12:25 -07:00
Jaikumar Ganesh
5ffad23e91 am 8d984bc9: am 017c5de1: Merge change I78c4e64a into eclair
Merge commit '8d984bc9c351e18271213c58ae7baea5cc81fda6'

* commit '8d984bc9c351e18271213c58ae7baea5cc81fda6':
  Query from Bluez if name is not present in cache.
2009-10-01 12:11:18 -07:00
Android Git Automerger
6eb1d79db5 merge 54e7073f, ignoring preloaded-classes 2009-10-01 12:07:15 -07:00
Andrei Popescu
ace8382a05 am d01d77f5: am 6e58cf21: Merge change I020d2e34 into eclair
Merge commit 'd01d77f5cc9ac037c5bc9c5b05f1decfec0abbe2'

* commit 'd01d77f5cc9ac037c5bc9c5b05f1decfec0abbe2':
  Invoke the OnErrorListener callback when MediaPlayer.setDataSource() throws.
2009-10-01 11:58:17 -07:00
Bryan Mawhinney
94b9befdf9 am 973c0998: am fb54aadd: Merge change Ic3aa7aa6 into eclair
Merge commit '973c0998b243a2fbfc1419238d50726c67c12cfb'

* commit '973c0998b243a2fbfc1419238d50726c67c12cfb':
  Recreate search dialog view each time it's shown.
2009-10-01 11:56:56 -07:00
Cary Clark
4c49cfb0dd am 8fbd4a7a: am 0c5924e9: preserve webkit-side text selection
Merge commit '8fbd4a7a6bb9dd68d39fff6c3b1fd91303765fc4'

* commit '8fbd4a7a6bb9dd68d39fff6c3b1fd91303765fc4':
  preserve webkit-side text selection
2009-10-01 11:56:46 -07:00
Leon Clarke
1b46ea41d3 am 2f208646: am ccf6947e: Merge change Ib89f80df into eclair
Merge commit '2f208646ebe7579c2b8694c66d55f8c883df0ec3'

* commit '2f208646ebe7579c2b8694c66d55f8c883df0ec3':
  Re-instate the link coloring on startup, but going via the browser
2009-10-01 11:55:25 -07:00
Jim Miller
1959d9321f am 2c799f05: am badfac38: Merge change I85d63002 into eclair
Merge commit '2c799f0534215e76ad2cd0fd4a513bd9f1fa0252'

* commit '2c799f0534215e76ad2cd0fd4a513bd9f1fa0252':
  Fix for 2139014: Allow platform customization of vibration pattern in LockScreenView.
2009-10-01 11:55:15 -07:00
Ray Chen
ede7a8220e am 5a92f5dc: am 49e750a3: Merge change I7495977a into eclair
Merge commit '5a92f5dc80ae74ad859b86c6d18d8ad42cc799a3'

* commit '5a92f5dc80ae74ad859b86c6d18d8ad42cc799a3':
  Add cancelThumbnailRequest to thumbnail API.
2009-10-01 11:52:39 -07:00
Costin Manolache
d153ea28e0 am 264f9b45: am 3348f14b: Remove GAIA string
Merge commit '264f9b4530d6ecbd9e9d02cf5c61c7b19f4c6376'

* commit '264f9b4530d6ecbd9e9d02cf5c61c7b19f4c6376':
  Remove GAIA string
2009-10-01 11:51:16 -07:00
Mike Cleron
a8b2d463b8 am 90183823: am b4ee8349: Merge change I290947bb into eclair
Merge commit '90183823b00ad5ce04948cf03d827a47c82ca445'

* commit '90183823b00ad5ce04948cf03d827a47c82ca445':
  Git sucks
2009-10-01 11:50:07 -07:00
Mike LeBeau
7b86961d45 am 6cf9ab65: am 2e4dbe70: Unhide APIs for enabling geolocation in web views. I\'ve confirmed with Grace that these are okay to unhide.
Merge commit '6cf9ab65888265aa87139694ed94ba0830b54707'

* commit '6cf9ab65888265aa87139694ed94ba0830b54707':
  Unhide APIs for enabling geolocation in web views. I've confirmed
2009-10-01 11:47:43 -07:00
Wu-cheng Li
42a7e790dd am 0ce5a41c: am 8d1ff3a4: Merge change I77153ee0 into eclair
Merge commit '0ce5a41c6074f40800dfcb5c48de0abef41f9833'

* commit '0ce5a41c6074f40800dfcb5c48de0abef41f9833':
  Hide zoom api.
2009-10-01 11:43:43 -07:00