Commit Graph

5486 Commits

Author SHA1 Message Date
Daisuke Miyakawa
2162904468 am c32897a6: Suppress Performance log emitted by vCard importer.
Merge commit 'c32897a6ead7e898dd37ac8bcec72e4cf89dadfa' into eclair-plus-aosp

* commit 'c32897a6ead7e898dd37ac8bcec72e4cf89dadfa':
  Suppress Performance log emitted by vCard importer.
2009-09-22 22:34:03 -07:00
Daisuke Miyakawa
75982b3a7e am 3559c14c: Merge change 26549 into eclair
Merge commit '3559c14c9c056b51e0def93625987e0a42c618f7' into eclair-plus-aosp

* commit '3559c14c9c056b51e0def93625987e0a42c618f7':
  Add Website.TYPE information.
2009-09-22 22:24:18 -07:00
Android (Google) Code Review
8ea1996cfe Merge change 26549 into eclair
* changes:
  Add Website.TYPE information.
2009-09-23 01:17:31 -04:00
Wei Huang
2bfb5013ca am a1dfa7f4: Merge change 26550 into eclair
Merge commit 'a1dfa7f4a108a7823d8da49ba5ea1777e283a724' into eclair-plus-aosp

* commit 'a1dfa7f4a108a7823d8da49ba5ea1777e283a724':
  fix bug 2134367: failing phone number compare test.
2009-09-22 22:10:22 -07:00
Android (Google) Code Review
d8dc3120ad Merge change 26550 into eclair
* changes:
  fix bug 2134367: failing phone number compare test.
2009-09-23 01:01:18 -04:00
Fred Quintana
e87d54d475 am be3bceb5: fix the logic for starting a sync after the accounts changed
Merge commit 'be3bceb5b908c23eeda5a8d04d2ea3d43cc7ed10' into eclair-plus-aosp

* commit 'be3bceb5b908c23eeda5a8d04d2ea3d43cc7ed10':
  fix the logic for starting a sync after the accounts changed
2009-09-22 21:22:47 -07:00
Fred Quintana
fcf7b71e58 am 3de07024: Merge change 26456 into eclair
Merge commit '3de07024c80fb8a983d4a804ff6d14a49b3f7979' into eclair-plus-aosp

* commit '3de07024c80fb8a983d4a804ff6d14a49b3f7979':
  - make an AccountManager per context, not one per process
2009-09-22 20:26:12 -07:00
Android (Google) Code Review
f72e082ce2 Merge change 26456 into eclair
* changes:
  - make an AccountManager per context, not one per process - enhance the comment for addOnAccountsUpdatedListener()
2009-09-22 23:20:25 -04:00
Xavier Ducrohet
addb4abd81 am 32f76f34: Merge change 26517 into eclair
Merge commit '32f76f34075450c03c68fc1f65e395d5eddd6d51' into eclair-plus-aosp

* commit '32f76f34075450c03c68fc1f65e395d5eddd6d51':
  Add a new IResourceValue that knows about the density.
2009-09-22 19:56:31 -07:00
Android (Google) Code Review
8a095e1d6d Merge change 26517 into eclair
* changes:
  Add a new IResourceValue that knows about the density.
2009-09-22 22:51:25 -04:00
Dianne Hackborn
f91018d000 am 7c47adef: Merge change 26527 into eclair
Merge commit '7c47adefea3101876f747926e7631406b4fbf45e' into eclair-plus-aosp

* commit '7c47adefea3101876f747926e7631406b4fbf45e':
  Dock screen on config can now select AC or USB.
2009-09-22 19:31:58 -07:00
Android (Google) Code Review
f38502c71c Merge change 26527 into eclair
* changes:
  Dock screen on config can now select AC or USB.
2009-09-22 22:24:10 -04:00
Daniel Sandler
d97d38a1c7 am 520ca7e5: Merge change 26415 into eclair
Merge commit '520ca7e503498f394ad67faf8caecea25a1930ea' into eclair-plus-aosp

* commit '520ca7e503498f394ad67faf8caecea25a1930ea':
  Add support for thumbnails to WallpaperInfo.
2009-09-22 19:12:52 -07:00
Jesse Wilson
613e2367d2 am c3c6621a: Merge change 25879 into eclair
Merge commit 'c3c6621a2cf2f0d40d062dcad1c9f65485473841' into eclair-plus-aosp

* commit 'c3c6621a2cf2f0d40d062dcad1c9f65485473841':
  Setting the default HTTP user agent at runtime init.
2009-09-22 19:12:40 -07:00
Android (Google) Code Review
a99fb28852 Merge change 26415 into eclair
* changes:
  Add support for thumbnails to WallpaperInfo.
2009-09-22 22:06:38 -04:00
Android (Google) Code Review
62909fdf31 Merge change 25879 into eclair
* changes:
  Setting the default HTTP user agent at runtime init.
2009-09-22 22:04:05 -04:00
Wei Huang
aab431be59 am df586217: Merge change 26446 into eclair
Merge commit 'df5862173c03f0d9595a2a5cb56c4af407d893dd' into eclair-plus-aosp

* commit 'df5862173c03f0d9595a2a5cb56c4af407d893dd':
  fix bug 2100169: add the line1 number + "/TYPE=PLMN" when sending a pdu.
2009-09-22 17:23:51 -07:00
Android (Google) Code Review
645e092dde Merge change 26446 into eclair
* changes:
  fix bug 2100169: add the line1 number + "/TYPE=PLMN" when sending a pdu.
2009-09-22 20:19:14 -04:00
Christopher Tate
7a77e91aad am 13006be1: Merge change 26457 into eclair
Merge commit '13006be19ef35f46effd10c422204cfe144136d6' into eclair-plus-aosp

* commit '13006be19ef35f46effd10c422204cfe144136d6':
  Don't restore any setting that we don't think should be backed up
2009-09-22 15:55:37 -07:00
Evan Millar
80a6ca15d3 am 5bb45740: Merge change 26459 into eclair
Merge commit '5bb45740d9554298dc19d8275c200f9fddbd2d6e' into eclair-plus-aosp

* commit '5bb45740d9554298dc19d8275c200f9fddbd2d6e':
  New fasttrack assets.
2009-09-22 15:50:56 -07:00
Costin Manolache
d168a80b05 am 4271c7c3: Merge change 26449 into eclair
Merge commit '4271c7c36bc6c3acef1a7d0926a5cf300e5efa4a' into eclair-plus-aosp

* commit '4271c7c36bc6c3acef1a7d0926a5cf300e5efa4a':
  Keep track of 'initial' sync state in SyncStatusInfo
2009-09-22 15:50:31 -07:00
Android (Google) Code Review
4f954e89e9 Merge change 26457 into eclair
* changes:
  Don't restore any setting that we don't think should be backed up
2009-09-22 18:47:14 -04:00
Android (Google) Code Review
b7d8f999ba Merge change 26459 into eclair
* changes:
  New fasttrack assets.
2009-09-22 18:32:46 -04:00
Android (Google) Code Review
f38f760972 Merge change 26449 into eclair
* changes:
  Keep track of 'initial' sync state in SyncStatusInfo
2009-09-22 18:28:58 -04:00
Mark Wagner
27872004ab am 63147705: Merge change 26437 into eclair
Merge commit '63147705bc2893d6ad43270e04beb9ee01e2ad53' into eclair-plus-aosp

* commit '63147705bc2893d6ad43270e04beb9ee01e2ad53':
  Don't show the badge background when we have no uri, email, or phone.
2009-09-22 14:39:02 -07:00
Christopher Tate
d08b3ba065 am b03b3bbd: If backup fails, reenqueue all of the affected packages for next time.
Merge commit 'b03b3bbd6833f7c6fbd8100fa3958220554f66a3' into eclair-plus-aosp

* commit 'b03b3bbd6833f7c6fbd8100fa3958220554f66a3':
  If backup fails, reenqueue all of the affected packages for next time.
2009-09-22 14:38:51 -07:00
Android (Google) Code Review
58807ca3b7 Merge change 26437 into eclair
* changes:
  Don't show the badge background when we have no uri, email, or phone.
2009-09-22 17:28:59 -04:00
Karl Rosaen
446cf5f1a9 am 36dac6ae: Merge change 26390 into eclair
Merge commit '36dac6ae8e005f0247e44345727d1580b1623127' into eclair-plus-aosp

* commit '36dac6ae8e005f0247e44345727d1580b1623127':
  Bring the dimples back, and make the "spin around" animation have a fling feeling.
2009-09-22 14:08:35 -07:00
Dianne Hackborn
814accd1b2 am 9bfb7075: Various fixes and improvements to window, activity.
Merge commit '9bfb707597898f54722460b48588007b682f3e2a' into eclair-plus-aosp

* commit '9bfb707597898f54722460b48588007b682f3e2a':
  Various fixes and improvements to window, activity.
2009-09-22 14:08:22 -07:00
Android (Google) Code Review
f8fac5acb8 Merge change 26390 into eclair
* changes:
  Bring the dimples back, and make the "spin around" animation have a fling feeling.
2009-09-22 17:01:13 -04:00
Derek Sollenberger
9fdcdbd8c1 am c0b8a96d: launching plugin activity when a plugin requests to go full screen.
Merge commit 'c0b8a96d28c55cb51e4f9e1f85c8d3ecf1ff13bf' into eclair-plus-aosp

* commit 'c0b8a96d28c55cb51e4f9e1f85c8d3ecf1ff13bf':
  launching plugin activity when a plugin requests to go full screen.
2009-09-22 13:39:39 -07:00
Jaikumar Ganesh
63807d1f85 am 34ca22d2: Merge change 26366 into eclair
Merge commit '34ca22d25303633c855a738409ea2f8e3f79a713' into eclair-plus-aosp

* commit '34ca22d25303633c855a738409ea2f8e3f79a713':
  Set the bonding for incoming connections only when authentication is requested.
2009-09-22 13:08:08 -07:00
Dan Egnor
57ae9dc8fa am 6c644f24: Merge change 26379 into eclair
Merge commit '6c644f248f553898248b8a6948fac4d62874fedd' into eclair-plus-aosp

* commit '6c644f248f553898248b8a6948fac4d62874fedd':
  Add parameter for the restore set (device id) data is being restored from to the restore_start event
2009-09-22 13:07:57 -07:00
Android (Google) Code Review
a5ed401bef Merge change 26366 into eclair
* changes:
  Set the bonding for incoming connections only when authentication is requested.
2009-09-22 16:00:12 -04:00
Android (Google) Code Review
719255d352 Merge change 26379 into eclair
* changes:
  Add parameter for the restore set (device id) data is being restored from to the restore_start event
2009-09-22 15:49:58 -04:00
Bjorn Bringert
1f4861fbff am 916b2ca9: Merge change 26355 into eclair
Merge commit '916b2ca9375b0a6a54e2bef2b2b5faab23ac3cfb' into eclair-plus-aosp

* commit '916b2ca9375b0a6a54e2bef2b2b5faab23ac3cfb':
  Use FLAG_ACTIVITY_CLEAR_TOP when launching search suggestions.
2009-09-22 12:42:48 -07:00
Android (Google) Code Review
4a2d3e2dd3 Merge change 26355 into eclair
* changes:
  Use FLAG_ACTIVITY_CLEAR_TOP when launching search suggestions.
2009-09-22 15:37:15 -04:00
Jason Sams
8973b56c50 am 78f180af: Merge change 26414 into eclair
Merge commit '78f180af218017898593021a0b7fdf9b38aa2b25' into eclair-plus-aosp

* commit '78f180af218017898593021a0b7fdf9b38aa2b25':
  Update viewport when height or width change.
2009-09-22 12:32:51 -07:00
Bjorn Bringert
d8ecf9fbf5 am af1eb148: Merge change 25465 into eclair
Merge commit 'af1eb148377f1dafacda429580b7cfe01781eb4d' into eclair-plus-aosp

* commit 'af1eb148377f1dafacda429580b7cfe01781eb4d':
  Reset typeface when changing from visible password inputType
2009-09-22 12:32:40 -07:00
Yu Shan Emily Lau
f25a5e7376 am 008fc5d1: Merge change 26332 into eclair
Merge commit '008fc5d142b58688a3827a544c524dff11204c62' into eclair-plus-aosp

* commit '008fc5d142b58688a3827a544c524dff11204c62':
  1) Add the wma / wmv profile reader.
2009-09-22 12:32:29 -07:00
Android (Google) Code Review
57096feba6 Merge change 26414 into eclair
* changes:
  Update viewport when height or width change.
2009-09-22 15:27:53 -04:00
Android (Google) Code Review
d99edc5912 Merge change 25465 into eclair
* changes:
  Reset typeface when changing from visible password inputType
2009-09-22 15:25:15 -04:00
Android (Google) Code Review
a64f9aa2e1 Merge change 26332 into eclair
* changes:
  1) Add the wma / wmv profile reader. 2) Add the flag which check the wma/wmv enable properties. If the codec is not enable, then skip the wma / wmv related test cases. 3) Added a workaround which let the testcodecspecific test case continue even though there is a failure in the middle of the test. Besides, take out the remvoeFile for temporary usage.
2009-09-22 15:09:33 -04:00
Andrei Popescu
8c74c6aaa4 am dee76be4: Fix for 2122292: make sure we unregister the ContentObserver for the system location settings. Also make the GoogleLocationManager use the singleton pattern correctly.
Merge commit 'dee76be487fcdc975877f85221a693b87b9669a7' into eclair-plus-aosp

* commit 'dee76be487fcdc975877f85221a693b87b9669a7':
  Fix for 2122292: make sure we unregister the ContentObserver for the system location settings. Also make the GoogleLocationManager use the singleton pattern correctly.
2009-09-22 12:02:59 -07:00
Grace Kloba
5be420557b am 24a3ff95: Change double tap toast to long toast.
Merge commit '24a3ff958b87550904a71961835f6883d1411c27' into eclair-plus-aosp

* commit '24a3ff958b87550904a71961835f6883d1411c27':
  Change double tap toast to long toast.
2009-09-22 12:02:46 -07:00
Nicolas Roard
fcf7cbc294 am 194099dc: Merge change 26220 into eclair
Merge commit '194099dc4f614130f3baff14850792e6dc3fa59b' into eclair-plus-aosp

* commit '194099dc4f614130f3baff14850792e6dc3fa59b':
  Reimplement the settings to use async callbacks
2009-09-22 11:10:41 -07:00
Android (Google) Code Review
445e07ef71 Merge change 26220 into eclair
* changes:
  Reimplement the settings to use async callbacks
2009-09-22 14:02:44 -04:00
Jack Veenstra
f3aca89e3e am 06766900: Merge change 26323 into eclair
Merge commit '0676690091b348d939db0340c3a0d888683c1abb' into eclair-plus-aosp

* commit '0676690091b348d939db0340c3a0d888683c1abb':
  Fix bug with ScrollView so that text entry fields are not hidden by virtual keyboard.
2009-09-22 10:35:24 -07:00
Patrick Scott
887e44b042 am d58ccff7: Add a boolean indicating if the apple-touch-icon is precomposed.
Merge commit 'd58ccff769e40a6c52e9f6e30e4016590e05ba9a' into eclair-plus-aosp

* commit 'd58ccff769e40a6c52e9f6e30e4016590e05ba9a':
  Add a boolean indicating if the apple-touch-icon is precomposed.
2009-09-22 10:35:12 -07:00
Android (Google) Code Review
fc05dcfe81 Merge change 26323 into eclair
* changes:
  Fix bug with ScrollView so that text entry fields are not hidden by virtual keyboard.
2009-09-22 13:31:02 -04:00