4806 Commits

Author SHA1 Message Date
Daisuke Miyakawa
83a54b479b am 3adab9fc: am 23703f16: Merge change 26732 into eclair
Merge commit '3adab9fcfffa57dd45e9ccace5e21123158e489b'

* commit '3adab9fcfffa57dd45e9ccace5e21123158e489b':
  Make ContactStruct explicitly set RawContacts.ACCOUNT_NAME and RawContacts.ACCOUNT_TYPE to null.
2009-09-25 11:02:26 -07:00
Jeff Sharkey
d037929626 am cc582a8e: am 63697af8: Generalize DELAY_STARRED_UPDATE location.
Merge commit 'cc582a8ee16de778439a2b6b793d88cf1b7f0de2'

* commit 'cc582a8ee16de778439a2b6b793d88cf1b7f0de2':
  Generalize DELAY_STARRED_UPDATE location.
2009-09-25 11:02:20 -07:00
Jeff Sharkey
3a322c9448 am dfd2f611: am 26d48eb3: Add Groups query parameters for delaying STARRED update.
Merge commit 'dfd2f6112ea497506aa4f636f6f8eb746c294b3c'

* commit 'dfd2f6112ea497506aa4f636f6f8eb746c294b3c':
  Add Groups query parameters for delaying STARRED update.
2009-09-25 11:02:10 -07:00
Dianne Hackborn
1bf5a19216 am ad8d9dfb: am ffa42480: Fix issue #2133206: dialogs/menus should auto-dismiss when screen turns off
Merge commit 'ad8d9dfb2458e5195df71afdcf07725a13ebe1c7'

* commit 'ad8d9dfb2458e5195df71afdcf07725a13ebe1c7':
  Fix issue #2133206: dialogs/menus should auto-dismiss when screen turns off
2009-09-25 11:01:14 -07:00
Jeff Hamilton
a5215089d5 am f4c102c4: am 0c23212e: Re-hide the contacts APIs, the droiddoc build is failing.
Merge commit 'f4c102c4a834dd17265780b2694759b113863c98'

* commit 'f4c102c4a834dd17265780b2694759b113863c98':
  Re-hide the contacts APIs, the droiddoc build is failing.
2009-09-25 11:00:22 -07:00
Lorenzo Colitti
cfeab40fc3 am 4d5cd955: am 7c5c6076: Merge change 26640 into eclair
Merge commit '4d5cd955423a6b0cb54c9e3030f4415db3e0b1e0'

* commit '4d5cd955423a6b0cb54c9e3030f4415db3e0b1e0':
  Support IPv6 literal URLs, e.g., http://[2001:4860:b004::68]/ as per RFC 3896
2009-09-25 11:00:02 -07:00
Mathias Agopian
12b25b1289 am ed4efca6: am 63e118ed: Merge change 26776 into eclair
Merge commit 'ed4efca6415bafcdc4df1b23d9d658c07883815f'

* commit 'ed4efca6415bafcdc4df1b23d9d658c07883815f':
  wallpaper: don't erase the background, just to repaint over it. saves 1.7 ms on some hardware
2009-09-25 10:59:41 -07:00
Jeff Hamilton
8240258627 am 259540ad: am 85abdc59: Make the new ContactsContract public.
Merge commit '259540ad8d6219fb09d2c55b0486139028dc68d0'

* commit '259540ad8d6219fb09d2c55b0486139028dc68d0':
  Make the new ContactsContract public.
2009-09-25 10:59:16 -07:00
Mike Cleron
481509f0cb am 99961218: am 769de37e: Merge change 26752 into eclair
Merge commit '99961218ed0ed9d64e533c2d0e377b3cf75f34da'

* commit '99961218ed0ed9d64e533c2d0e377b3cf75f34da':
  Fix 2105956: The nine patch markers for one of the zoom buttons were reversed
2009-09-25 10:56:56 -07:00
Mike Cleron
3b3dba5871 am f12c6f30: am 880aaa7f: Merge change 26730 into eclair
Merge commit 'f12c6f3015a6b42cb487ec5e94e764a8fd03e2fd'

* commit 'f12c6f3015a6b42cb487ec5e94e764a8fd03e2fd':
  Fix 2132058: Tweak hdpi textfield assets so they align with buttons
2009-09-25 10:56:24 -07:00
Dianne Hackborn
d813cbaef1 am b8f193da: am ce605142: Merge change 26717 into eclair
Merge commit 'b8f193da852dcd341b506dbbd14860be2ed3b2fc'

* commit 'b8f193da852dcd341b506dbbd14860be2ed3b2fc':
  Newer animations.
2009-09-25 10:55:50 -07:00
Wu-cheng Li
62156eacd8 am a3031157: am e6bea600: Change setRotation documentaion.
Merge commit 'a303115742777801b27b98fa4448ebac0ad8de14'

* commit 'a303115742777801b27b98fa4448ebac0ad8de14':
  Change setRotation documentaion.
2009-09-25 10:55:23 -07:00
Jim Miller
9109262bc9 am 1f21839a: am 8799b96e: Merge change 26314 into eclair
Merge commit '1f21839a9828995eb01634f36d34c55ca9aeca3e'

* commit '1f21839a9828995eb01634f36d34c55ca9aeca3e':
  Delay broadcasting ACCOUNTS_CHANGED until we're certain AndroidId is ready.
2009-09-25 10:55:01 -07:00
Fred Quintana
27bcfd3f1a am 3fee3fb6: am 8f1e5981: Merge change 26653 into eclair
Merge commit '3fee3fb646fc81d199007d1eacfef7abb4e0650c'

* commit '3fee3fb646fc81d199007d1eacfef7abb4e0650c':
  make the SyncManager listen for backgroun data setting changes and do a sync when the setting is enabled
2009-09-25 10:54:42 -07:00
Dianne Hackborn
466ccfd9ef am 5ddbc0d5: am de0dfb7b: Fix issue #2125720 Weather Forecast Widget - graphics do not scale
Merge commit '5ddbc0d59d8143d50a19950624c38fdb8102156b'

* commit '5ddbc0d59d8143d50a19950624c38fdb8102156b':
  Fix issue #2125720 Weather Forecast Widget - graphics do not scale
2009-09-25 10:52:48 -07:00
Sanjay Jeyakumar
4e33f659e1 am ea986e30: am f017167f: Merge change 25794 into eclair
Merge commit 'ea986e301f3f67c3d3446961b5f316c7c4f3112c'

* commit 'ea986e301f3f67c3d3446961b5f316c7c4f3112c':
  Remove the GDD Gservices setting.
2009-09-25 10:51:49 -07:00
Debajit Ghosh
c086848a07 am 6351cf72: am 193a6261: Merge change 26537 into eclair
Merge commit '6351cf72a55def4e1bca5764dea8cbca99f13b90'

* commit '6351cf72a55def4e1bca5764dea8cbca99f13b90':
  add hashCode() and equals() to Rfc822Token, as well as a convenience tokenizer method to Rfc822Tokenizer, as part of a calendar guest bugfix.
2009-09-25 10:51:43 -07:00
Cary Clark
4e021ac509 am 307ad592: am 37703b6c: invalidate the webview after pressing the IME \'next\' button
Merge commit '307ad592b8aa5d9246f7db4f8f1f8faafbe5eafa'

* commit '307ad592b8aa5d9246f7db4f8f1f8faafbe5eafa':
  invalidate the webview after pressing the IME 'next' button
2009-09-25 10:50:39 -07:00
Daniel Sandler
02e11f49ca am e201a1df: am 3f2c70fb: Merge change 26627 into eclair
Merge commit 'e201a1df142dcd694456fcc863f8dddfa0e2087e'

* commit 'e201a1df142dcd694456fcc863f8dddfa0e2087e':
  Convert instances of px in default UI styles to dip.
2009-09-25 10:49:42 -07:00
Ray Chen
4298f3e3b9 am 94cdc3d0: am 830207ca: Merge change 25635 into eclair
Merge commit '94cdc3d0e2c7f4f001177829f6bbf3b52ce07b98'

* commit '94cdc3d0e2c7f4f001177829f6bbf3b52ce07b98':
  Add new thumbnail API.
2009-09-25 10:49:09 -07:00
Android (Google) Code Review
01f32e6b2e Merge change 26968
* changes:
  Clobber frameworks/base/core/java/android/speech in master with the one in eclair.
2009-09-25 12:22:23 -04:00
Leon Scroggins
9695de6bc4 am 2fd49438: am 6d181166: Merge change 26615 into eclair
Merge commit '2fd4943847d0209bef39171c1278ad6c86072dcc'

* commit '2fd4943847d0209bef39171c1278ad6c86072dcc':
  Provide a getter to access the width of the HTML document.
2009-09-25 08:52:58 -07:00
Daniel Sandler
ca5f8622a1 am 61107890: am 9d12fdb1: Merge change 26625 into eclair
Merge commit '611078906ce7ff538f7fbc9618ef8054665d0624'

* commit '611078906ce7ff538f7fbc9618ef8054665d0624':
  Fix http://b/2139600 (expander indicators misaligned).
2009-09-25 08:52:26 -07:00
Wei Huang
309714fac9 am c3bfa604: am b06c9a8c: Merge change 26579 into eclair
Merge commit 'c3bfa6048da74dd54f9147f6600ad0537cbe7bd6'

* commit 'c3bfa6048da74dd54f9147f6600ad0537cbe7bd6':
  add definition for Mms.TempStorage content uri and filename.
2009-09-25 08:50:54 -07:00
Cary Clark
db9eaad8eb am 3c385116: am b82665e7: don\'t allow min scale to go to infinity
Merge commit '3c385116e98e6812813049206cb85417f1bccb21'

* commit '3c385116e98e6812813049206cb85417f1bccb21':
  don't allow min scale to go to infinity
2009-09-25 08:50:44 -07:00
Ben Murdoch
0b4263a2ed am ea2aabf1: am c28e3a67: Merge change 26595 into eclair
Merge commit 'ea2aabf1b21f756f06b0b7535c80807d986683d8'

* commit 'ea2aabf1b21f756f06b0b7535c80807d986683d8':
  Move destroying the web view to the WVC thread (previously it was on the UI thread)
2009-09-25 08:50:31 -07:00
Leon Scroggins
4f73c0021b am 90c0d0ab: am d4c00a17: Merge change 26590 into eclair
Merge commit '90c0d0ab42ec909290abcc168ac0deded05a1141'

* commit '90c0d0ab42ec909290abcc168ac0deded05a1141':
  In calcOurContentVisibleRect, account for the visible title bar.
2009-09-25 08:50:05 -07:00
Bjorn Bringert
97df191fbb am e7244b04: am dbce92ab: Merge change 26587 into eclair
Merge commit 'e7244b0482f6bdb21fc27aca078372333d0de5a2'

* commit 'e7244b0482f6bdb21fc27aca078372333d0de5a2':
  Back button in search always goes back or closes search
2009-09-25 08:49:55 -07:00
Dianne Hackborn
89c11c14b7 am 8f0d6469: am c413d54c: Merge change 26573 into eclair
Merge commit '8f0d64693e155b1db2ff89cde1f050b4b6b0ec7a'

* commit '8f0d64693e155b1db2ff89cde1f050b4b6b0ec7a':
  Fix bug where onStartCommand() was never called with a null intent.
2009-09-25 08:49:12 -07:00
Daisuke Miyakawa
95db01c186 am b452ea0e: am d2cd9467: Suppress warning around old vcard code.
Merge commit 'b452ea0e6835e95d4b5cdf50911f3d4a1fce34f1'

* commit 'b452ea0e6835e95d4b5cdf50911f3d4a1fce34f1':
  Suppress warning around old vcard code.
2009-09-25 08:48:52 -07:00
Daisuke Miyakawa
4d88d816ea am 4337a244: am c32897a6: Suppress Performance log emitted by vCard importer.
Merge commit '4337a244c43fd431598dd3fd0890accd1e394607'

* commit '4337a244c43fd431598dd3fd0890accd1e394607':
  Suppress Performance log emitted by vCard importer.
2009-09-25 08:48:46 -07:00
Daisuke Miyakawa
c226734d70 am 90b76580: am 3559c14c: Merge change 26549 into eclair
Merge commit '90b765807e1658493b328be34ef50c44ba7ccf03'

* commit '90b765807e1658493b328be34ef50c44ba7ccf03':
  Add Website.TYPE information.
2009-09-25 08:48:39 -07:00
Fred Quintana
1a0fa5093b am f73afeee: am be3bceb5: fix the logic for starting a sync after the accounts changed
Merge commit 'f73afeeec3d4c841207ffc4e5415b8fe4555a5a1'

* commit 'f73afeeec3d4c841207ffc4e5415b8fe4555a5a1':
  fix the logic for starting a sync after the accounts changed
2009-09-25 08:48:02 -07:00
Fred Quintana
2c22c1f4d1 am d5b16418: am 3de07024: Merge change 26456 into eclair
Merge commit 'd5b16418ed7dcdeeba108bad0e4c78ef25ded52c'

* commit 'd5b16418ed7dcdeeba108bad0e4c78ef25ded52c':
  - make an AccountManager per context, not one per process
2009-09-25 08:47:23 -07:00
Dianne Hackborn
5d2b52adb8 am 648297ff: am 7c47adef: Merge change 26527 into eclair
Merge commit '648297ff5d1a56f08985d26d58f1471e2ff0ba86'

* commit '648297ff5d1a56f08985d26d58f1471e2ff0ba86':
  Dock screen on config can now select AC or USB.
2009-09-25 08:46:37 -07:00
Daniel Sandler
3cd1f3dcfb am 2b0d6e7e: am 520ca7e5: Merge change 26415 into eclair
Merge commit '2b0d6e7e43f92b1fb1dea207b3eb4121369594c3'

* commit '2b0d6e7e43f92b1fb1dea207b3eb4121369594c3':
  Add support for thumbnails to WallpaperInfo.
2009-09-25 08:46:23 -07:00
Jesse Wilson
9659c13be3 am 7ca38352: am c3c6621a: Merge change 25879 into eclair
Merge commit '7ca38352b911bfd299f5862da930e388eba7f903'

* commit '7ca38352b911bfd299f5862da930e388eba7f903':
  Setting the default HTTP user agent at runtime init.
2009-09-25 08:46:16 -07:00
Mike LeBeau
0406eb00f2 Clobber frameworks/base/core/java/android/speech in master with the
one in eclair.
2009-09-24 17:32:26 -07:00
Daisuke Miyakawa
3adab9fcff am 23703f16: Merge change 26732 into eclair
Merge commit '23703f16f816d4212e5a95c101a851660c095f24' into eclair-plus-aosp

* commit '23703f16f816d4212e5a95c101a851660c095f24':
  Make ContactStruct explicitly set RawContacts.ACCOUNT_NAME and RawContacts.ACCOUNT_TYPE to null.
2009-09-24 01:50:35 -07:00
Jeff Sharkey
cc582a8ee1 am 63697af8: Generalize DELAY_STARRED_UPDATE location.
Merge commit '63697af83b5479733f2d4398b4199b8e492f532b' into eclair-plus-aosp

* commit '63697af83b5479733f2d4398b4199b8e492f532b':
  Generalize DELAY_STARRED_UPDATE location.
2009-09-24 01:50:23 -07:00
Android (Google) Code Review
23703f16f8 Merge change 26732 into eclair
* changes:
  Make ContactStruct explicitly set RawContacts.ACCOUNT_NAME and RawContacts.ACCOUNT_TYPE to null.
2009-09-24 04:42:02 -04:00
Jeff Sharkey
63697af83b Generalize DELAY_STARRED_UPDATE location. 2009-09-24 01:26:22 -07:00
Jeff Sharkey
dfd2f6112e am 26d48eb3: Add Groups query parameters for delaying STARRED update.
Merge commit '26d48eb38e533402aa90add8d01489dace92af2f' into eclair-plus-aosp

* commit '26d48eb38e533402aa90add8d01489dace92af2f':
  Add Groups query parameters for delaying STARRED update.
2009-09-24 01:24:39 -07:00
Jeff Sharkey
26d48eb38e Add Groups query parameters for delaying STARRED update.
Part of fixing http://b/2075275
2009-09-24 01:15:19 -07:00
Dianne Hackborn
ad8d9dfb24 am ffa42480: Fix issue #2133206: dialogs/menus should auto-dismiss when screen turns off
Merge commit 'ffa424800d0338b8b894aef2ea1e3e3344cbda7a' into eclair-plus-aosp

* commit 'ffa424800d0338b8b894aef2ea1e3e3344cbda7a':
  Fix issue #2133206: dialogs/menus should auto-dismiss when screen turns off
2009-09-23 23:28:06 -07:00
Dianne Hackborn
ffa424800d Fix issue #2133206: dialogs/menus should auto-dismiss when screen turns off
Lot of infrastructure for more things to go away when "clear system dialogs"
happens, and now do this when we turn on the lock screen.

Change-Id: I567130296fe47ce82df065ed58ef21b37416ceaf
2009-09-23 23:17:07 -07:00
Jeff Hamilton
f4c102c4a8 am 0c23212e: Re-hide the contacts APIs, the droiddoc build is failing.
Merge commit '0c23212ebdfbe008aca95d2ace2e52ca0a0b7ec7' into eclair-plus-aosp

* commit '0c23212ebdfbe008aca95d2ace2e52ca0a0b7ec7':
  Re-hide the contacts APIs, the droiddoc build is failing.
2009-09-23 22:34:33 -07:00
Jeff Hamilton
0c23212ebd Re-hide the contacts APIs, the droiddoc build is failing.
Change-Id: I1d1e73924e26045ad137a19c32976ecfe68c7d49
2009-09-24 00:26:50 -05:00
Lorenzo Colitti
4d5cd95542 am 7c5c6076: Merge change 26640 into eclair
Merge commit '7c5c6076ea5d02aabbb449b1341ec44d184d1316' into eclair-plus-aosp

* commit '7c5c6076ea5d02aabbb449b1341ec44d184d1316':
  Support IPv6 literal URLs, e.g., http://[2001:4860:b004::68]/ as per RFC 3896
2009-09-23 22:09:41 -07:00
Android (Google) Code Review
7c5c6076ea Merge change 26640 into eclair
* changes:
  Support IPv6 literal URLs, e.g., http://[2001:4860:b004::68]/ as per RFC 3896 section 3.2.2.
2009-09-24 01:03:58 -04:00