4999 Commits

Author SHA1 Message Date
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
Karl Rosaen
ba65129773 am 52c37d64: Merge change 27065 into eclair
Merge commit '52c37d6402f14d180f6855cc1438ca62141205ca' into eclair-plus-aosp

* commit '52c37d6402f14d180f6855cc1438ca62141205ca':
  Remove vertical separator from landscape layout of pattern lock screen.
2009-09-25 10:49:15 -07:00
Brad Fitzpatrick
0623e674d9 am 3219ab4d: Fix typo in Bluetooth docs.
Merge commit '3219ab4de27cd40b2149b0dd13edd412efe40244' into eclair-plus-aosp

* commit '3219ab4de27cd40b2149b0dd13edd412efe40244':
  Fix typo in Bluetooth docs.
2009-09-25 10:49:09 -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
52c37d6402 Merge change 27065 into eclair
* changes:
  Remove vertical separator from landscape layout of pattern lock screen.
2009-09-25 13:43:16 -04:00
Karl Rosaen
9507490ede Remove vertical separator from landscape layout of pattern lock screen. 2009-09-25 10:42:35 -07:00
Brad Fitzpatrick
3219ab4de2 Fix typo in Bluetooth docs. 2009-09-25 20:28:02 +04: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
Cary Clark
6fb27c5a68 am 96cfad5d: check for null before calling native webkit from java webview
Merge commit '96cfad5d673b49d8b3a724d7b1066493aacd74d5' into eclair-plus-aosp

* commit '96cfad5d673b49d8b3a724d7b1066493aacd74d5':
  check for null before calling native webkit from java webview
2009-09-25 09:14:27 -07:00
Cary Clark
96cfad5d67 check for null before calling native webkit from java webview
fixes http://b/issue?id=2121684
2009-09-25 12:06:20 -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
Bryan Mawhinney
7e74262ab6 am 82e62668: Merge change 27038 into eclair
Merge commit '82e62668d0d3e09f27629c7aff6425faacdfa7f8' into eclair-plus-aosp

* commit '82e62668d0d3e09f27629c7aff6425faacdfa7f8':
  Redraw search autocomplete dropdown after config change.
2009-09-25 07:50:12 -07:00
Android (Google) Code Review
82e62668d0 Merge change 27038 into eclair
* changes:
  Redraw search autocomplete dropdown after config change.
2009-09-25 10:43:10 -04:00
Bryan Mawhinney
29d52e120f Redraw search autocomplete dropdown after config change.
This ensures the dropdown is redrawn after changing
from landscape to portrait mode, for example.

Change-Id: I71f4425d1df789faf34d20dd30b3a5c64b5caec3
2009-09-25 15:35:21 +01:00
Bjorn Bringert
079b824cf0 am 81d84c0c: am 6266e40a: Better JavaDoc for Activity.onSearchRequested().
Merge commit '81d84c0cb244290a58bf8e78a3d638750cf7dd3f' into eclair-plus-aosp

* commit '81d84c0cb244290a58bf8e78a3d638750cf7dd3f':
  Better JavaDoc for Activity.onSearchRequested().
2009-09-25 06:51:01 -07:00
Bjorn Bringert
81d84c0cb2 am 6266e40a: Better JavaDoc for Activity.onSearchRequested().
Merge commit '6266e40a754d82afa717ef068898c8418a0bb5c3' into eclair

* commit '6266e40a754d82afa717ef068898c8418a0bb5c3':
  Better JavaDoc for Activity.onSearchRequested().
2009-09-25 06:45:02 -07:00
Bjorn Bringert
6266e40a75 Better JavaDoc for Activity.onSearchRequested().
Fixes http://b/issue?id=1248721
2009-09-25 14:25:41 +01:00
Bryan Mawhinney
067e0164ca am 42b7af57: Dismiss QSB dialog when doing an in-app global search.
Merge commit '42b7af57c59d8b7cb9be3fea713478424b53b7fc' into eclair-plus-aosp

* commit '42b7af57c59d8b7cb9be3fea713478424b53b7fc':
  Dismiss QSB dialog when doing an in-app global search.
2009-09-25 04:15:01 -07:00
Bryan Mawhinney
42b7af57c5 Dismiss QSB dialog when doing an in-app global search.
This prevents QSB from obscuring the results when they are handled
by the current application.

Bug: 2141208
Change-Id: I6f848aa2003c75b97effe1d3d2af5316ad4fbf92
2009-09-25 11:09:55 +01:00
Dianne Hackborn
c6cfd0b0cc am 3e2ac884: Fix/improve issue #2142662: too easy to click a link/item instead of fling
Merge commit '3e2ac8843489e83c4171aabcfe98769b5159a5c8' into eclair-plus-aosp

* commit '3e2ac8843489e83c4171aabcfe98769b5159a5c8':
  Fix/improve issue #2142662: too easy to click a link/item instead of fling
2009-09-25 01:44:28 -07:00
Dianne Hackborn
3e2ac88434 Fix/improve issue #2142662: too easy to click a link/item instead of fling
Reduce the slop.

Change-Id: If255e68cc8092e7f746a91c0fea27abfc5292b73
2009-09-25 01:34:28 -07:00
Dianne Hackborn
7510aba7a5 am 896b15ab: Merge change 27016 into eclair
Merge commit '896b15abea4e1c0ee98330964474672a7316ee50' into eclair-plus-aosp

* commit '896b15abea4e1c0ee98330964474672a7316ee50':
  A variety of work on animations.
2009-09-25 00:57:27 -07:00
Dianne Hackborn
3b3e145d3c A variety of work on animations.
- The lock screen now fades in and out.
- Fixed a bug where we would accidentally freeze the screen when switching
  to an activity with a different orientation than the current (but
  the screen itself is in the current orientation).  This would mess up
  the animations on the car dock.
- New API to force a particular animation for an activity transition
  (untested).
- New wallpaper animations.
- Resources now uses the next API version when in a development build,
  to help applications being developed against such builds.

Change-Id: I2d9998f8400967ff09a04d693dc4ce55f0dbef5b
2009-09-25 00:48:02 -07:00
Mike Cleron
f45076dd37 am fdf53a46: Merge change 26935 into eclair
Merge commit 'fdf53a4628f915203752660aa07049aa22c01b5a' into eclair-plus-aosp

* commit 'fdf53a4628f915203752660aa07049aa22c01b5a':
  Fix bug 2129190
2009-09-24 21:54:03 -07:00
Android (Google) Code Review
fdf53a4628 Merge change 26935 into eclair
* changes:
  Fix bug 2129190 The context used by the status bar (i.e., the system context) was not properly initialized to have the right ApplicationInfo inside its PackageInfo. This eventually caused it to believe that it was running at 160dpi.
2009-09-25 00:45:23 -04:00
Mike Cleron
432b713c94 Fix bug 2129190
The context used by the status bar (i.e., the system context) was
not properly initialized to have the right ApplicationInfo inside
its PackageInfo. This eventually caused it to believe that it
was running at 160dpi.

Kudos to Dianne for figuring this out.
2009-09-24 21:41:19 -07:00
Nick Pelly
b2209a35af am 1a42cfac: Use LM_SECURE when auth && encrypt.
Merge commit '1a42cfac152faa98c2e3d9e9fd6889209de195fe' into eclair-plus-aosp

* commit '1a42cfac152faa98c2e3d9e9fd6889209de195fe':
  Use LM_SECURE when auth && encrypt.
2009-09-24 19:47:08 -07:00
Nick Pelly
a7e508eb55 am 18b1e79a: Bluetooth API: Do not allow apps to programmatically make BT discoverable.
Merge commit '18b1e79a123b979d25bfa5d0b0ee5d0382dbd64b' into eclair-plus-aosp

* commit '18b1e79a123b979d25bfa5d0b0ee5d0382dbd64b':
  Bluetooth API: Do not allow apps to programmatically make BT discoverable.
2009-09-24 19:47:03 -07:00
Nick Pelly
1a42cfac15 Use LM_SECURE when auth && encrypt.
LM_SECURE enforces man in the middle (MITM) protection.

Change-Id: Ia800bb657b429f8872d72072f7c9450a74028af0
2009-09-24 19:36:27 -07:00
Nick Pelly
18b1e79a12 Bluetooth API: Do not allow apps to programmatically make BT discoverable.
Instead add ACTION_REQUEST_DISCOVERABLE for the system to show a dialog to
adjust discoverable mode.

Also remove createBond(), removeBond() and cancelBondProcess(). The Settings
App already handles these automatically when connections require bonding.

Change-Id: I216154cd1b6de410de64ba91b07d7263ac03e8df
2009-09-24 19:34:54 -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
Chih-Chung Chang
5e367bfe07 am 0665ae22: Merge change 26939 into eclair
Merge commit '0665ae22aa51183d6ff5fdd0abeee0344306e89d' into eclair-plus-aosp

* commit '0665ae22aa51183d6ff5fdd0abeee0344306e89d':
  Fix 2101425: Camera crashes spontaneously in preview.
2009-09-24 17:04:38 -07:00