Commit Graph

38903 Commits

Author SHA1 Message Date
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
Marco Nelissen
bb664b5e53 am d6f3b0b5: am bdeccbba: Merge change 26623 into eclair
Merge commit 'd6f3b0b5ba733ad9605e9e55a858d870b3812cde'

* commit 'd6f3b0b5ba733ad9605e9e55a858d870b3812cde':
  fbDev wasn't initialized of hw_get_module failed, but was then used anyway.
2009-09-25 10:50:32 -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
Dianne Hackborn
5bb3cf1267 am 62ebb5a0: am 7475be4b: Merge change 26636 into eclair
Merge commit '62ebb5a0a0573dfa2acc04c966fc691f37f7b132'

* commit '62ebb5a0a0573dfa2acc04c966fc691f37f7b132':
  Fix #2101821: Cut labels of menu items in "SnapTell" market app.
2009-09-25 10:49:35 -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
Bob Lee
44256a609e am a37b3616: (-s ours) am 3136d4b0: Merge change 26635 into eclair
Merge commit 'a37b3616932e03122b536ff2b9f038c3ae65da4e'

* commit 'a37b3616932e03122b536ff2b9f038c3ae65da4e':
  Added tool to generate application-specific reports from class load profiling data. Generated new profiling data. Deleted old data. Generated new preloaded-classes file.
2009-09-25 10:48:57 -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
Karl Rosaen
a35d753add Remove keyguard view after a delay instead of just hiding it.
The delay should make sure the animation works, and by still removing it, we
preserve the initialization logic that depends on being reinstantiated each time
the screen turns off.  The logic could be adjusted to work without this, but
seems safer to maintain the existing behavior. Also reduces risk from having
keyguard around all the time.
2009-09-25 10:26:22 -07:00
android-build SharedAccount
e89fec340c Merge commit 'goog/eclair' into eclair-release 2009-09-25 09:34:25 -07:00
Joe Onorato
9e338d27f6 am 82768db5: Merge change 27046 into eclair
Merge commit '82768db56b8f6a6d22adba36df9539550091d411' into eclair-plus-aosp

* commit '82768db56b8f6a6d22adba36df9539550091d411':
  Add a method to destroy the RS object.
2009-09-25 09:29:17 -07:00
Scott Main
13c433f88f am d1cfd259: am c1828d5a: Merge change 3583 into donut
Merge commit 'd1cfd259bc0186259edb75ddf141cb8245842e46' into eclair-plus-aosp

* commit 'd1cfd259bc0186259edb75ddf141cb8245842e46':
  implement browser history for tabbed search results...
2009-09-25 09:29:12 -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
Android (Google) Code Review
82768db56b Merge change 27046 into eclair
* changes:
  Add a method to destroy the RS object.
2009-09-25 12:21:21 -04:00
Scott Main
d1cfd259bc am c1828d5a: Merge change 3583 into donut
Merge commit 'c1828d5a492a14a9b15e9106684079049317313e' into eclair

* commit 'c1828d5a492a14a9b15e9106684079049317313e':
  implement browser history for tabbed search results...
2009-09-25 09:15:13 -07: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
Tadashi G. Takaoka
86135d3240 Pass provider authority to SyncActivityTooManyDeletes
Internal Bug: 2138733
2009-09-25 09:12:25 -07:00
Joe Onorato
5fda65f182 Add a method to destroy the RS object. 2009-09-25 09:12:16 -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
Android (Google) Code Review
c1828d5a49 Merge change 3583 into donut
* changes:
  implement browser history for tabbed search results... this adds a parameter to the URL hash on all search queries. the main motive is to allow searches from the blog to automatically open the blog tab.
2009-09-25 12:05:28 -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
Xavier Ducrohet
bd338c226b am b47d07c2: am 0acf9a5b: Merge change 26539 into eclair
Merge commit 'b47d07c29d70f487ea21e91313947d18367796c2'

* commit 'b47d07c29d70f487ea21e91313947d18367796c2':
  Add density value to density enum.
2009-09-25 08:51:19 -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
Jesse Wilson
c4fb8966ae am 36b10bf5: (-s ours) am ecaf00e8: DO NOT MERGE: Copy 4.xml to 5.xml to allow Eclair to diverge from Donut.
Merge commit '36b10bf525ed6d9819e696509530f19fb3d15275'

* commit '36b10bf525ed6d9819e696509530f19fb3d15275':
  DO NOT MERGE: Copy 4.xml to 5.xml to allow Eclair to diverge from Donut.
2009-09-25 08:49:06 -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
Wei Huang
0ba9d05292 am 7bcf59c4: am a1dfa7f4: Merge change 26550 into eclair
Merge commit '7bcf59c43d7b52cff702d3d9bcca322451673a0a'

* commit '7bcf59c43d7b52cff702d3d9bcca322451673a0a':
  fix bug 2134367: failing phone number compare test.
2009-09-25 08:48:16 -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
Xavier Ducrohet
950160c0cf am 296e7b95: am 32f76f34: Merge change 26517 into eclair
Merge commit '296e7b951914f983b4d063da02d38162ac01abd0'

* commit '296e7b951914f983b4d063da02d38162ac01abd0':
  Add a new IResourceValue that knows about the density.
2009-09-25 08:47:12 -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
Dianne Hackborn
eea2c15f11 am adda0c0f: Allow dock keep screen on to select between AC and USB power.
Merge commit 'adda0c0fb04a828a71aba1bffa20689427b972bd'

* commit 'adda0c0fb04a828a71aba1bffa20689427b972bd':
  Allow dock keep screen on to select between AC and USB power.
2009-09-25 08:46:28 -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