9930 Commits

Author SHA1 Message Date
Dianne Hackborn
4336317687 am 74468de2: am 9d31e1be: Merge change 26686 into eclair
Merge commit '74468de20b53a3ecea666b5557ec1a0e27f8946d'

* commit '74468de20b53a3ecea666b5557ec1a0e27f8946d':
  Fix broken build.
2009-09-25 10:53:52 -07:00
Jack Palevich
193543dd9e am b09c63e2: am 311ed019: Merge change 26679 into eclair
Merge commit 'b09c63e24043a6ca03f04709a92f528d233fd8d7'

* commit 'b09c63e24043a6ca03f04709a92f528d233fd8d7':
  Create samples showing how to call OpenGL from JNI libraries.
2009-09-25 10:53:33 -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
Jason Sams
04ec506d36 am addb0c52: am 5dd7c726: Merge change 26667 into eclair
Merge commit 'addb0c52ba9a0aac019a21b9d49b4a51d53c2014'

* commit 'addb0c52ba9a0aac019a21b9d49b4a51d53c2014':
  Add raster object to control point and line params. Add flag to force SW rendering.
2009-09-25 10:52:12 -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
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
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
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
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
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
Dianne Hackborn
74468de20b am 9d31e1be: Merge change 26686 into eclair
Merge commit '9d31e1bebaf3ae5d54751c32466edcea6e7433dd' into eclair-plus-aosp

* commit '9d31e1bebaf3ae5d54751c32466edcea6e7433dd':
  Fix broken build.
2009-09-23 15:28:53 -07:00
Android (Google) Code Review
9d31e1beba Merge change 26686 into eclair
* changes:
  Fix broken build.
2009-09-23 18:21:23 -04:00
Dianne Hackborn
a52b4d764e Fix broken build.
I -did- run it...  why did this later break on me?!?

Change-Id: I70db0279f9a1b499496f9808525d2b112495d6c7
2009-09-23 15:17:39 -07:00
Jack Palevich
b09c63e240 am 311ed019: Merge change 26679 into eclair
Merge commit '311ed0191d6423e41b1cf5137a38e53504494818' into eclair-plus-aosp

* commit '311ed0191d6423e41b1cf5137a38e53504494818':
  Create samples showing how to call OpenGL from JNI libraries.
2009-09-23 15:03:46 -07:00
Android (Google) Code Review
311ed0191d Merge change 26679 into eclair
* changes:
  Create samples showing how to call OpenGL from JNI libraries.
2009-09-23 17:53:54 -04:00
Jack Palevich
a8fecb87c5 Create samples showing how to call OpenGL from JNI libraries. 2009-09-23 14:48:07 -07:00
Dianne Hackborn
5ddbc0d59d am de0dfb7b: Fix issue #2125720 Weather Forecast Widget - graphics do not scale
Merge commit 'de0dfb7b65a02d4dd74c271b558adee0973fc267' into eclair-plus-aosp

* commit 'de0dfb7b65a02d4dd74c271b558adee0973fc267':
  Fix issue #2125720 Weather Forecast Widget - graphics do not scale
2009-09-23 14:36:42 -07:00
Dianne Hackborn
de0dfb7b65 Fix issue #2125720 Weather Forecast Widget - graphics do not scale
I forgot to add the new density field to the Bitmaps' parcelable data.

Change-Id: I77cf3e93e356297e0caed6fc71b62b5cd8f79124
2009-09-23 14:26:02 -07:00
Jason Sams
addb0c52ba am 5dd7c726: Merge change 26667 into eclair
Merge commit '5dd7c726f45fd7b7ab473471dc504c00012a6856' into eclair-plus-aosp

* commit '5dd7c726f45fd7b7ab473471dc504c00012a6856':
  Add raster object to control point and line params. Add flag to force SW rendering.
2009-09-23 14:06:46 -07:00
Android (Google) Code Review
5dd7c726f4 Merge change 26667 into eclair
* changes:
  Add raster object to control point and line params. Add flag to force SW rendering.
2009-09-23 17:00:22 -04:00
Jason Sams
ebfb436a49 Add raster object to control point and line params. Add flag to force SW rendering. 2009-09-23 13:57:02 -07:00
Sanjay Jeyakumar
ea986e301f am f017167f: Merge change 25794 into eclair
Merge commit 'f017167f52e2459cf16fabde8afb5a6c51bd780f' into eclair-plus-aosp

* commit 'f017167f52e2459cf16fabde8afb5a6c51bd780f':
  Remove the GDD Gservices setting.
2009-09-23 13:46:07 -07:00
Debajit Ghosh
6351cf72a5 am 193a6261: Merge change 26537 into eclair
Merge commit '193a6261894619985866220c320017f0831d6055' into eclair-plus-aosp

* commit '193a6261894619985866220c320017f0831d6055':
  add hashCode() and equals() to Rfc822Token, as well as a convenience tokenizer method to Rfc822Tokenizer, as part of a calendar guest bugfix.
2009-09-23 13:45:55 -07:00
Android (Google) Code Review
f017167f52 Merge change 25794 into eclair
* changes:
  Remove the GDD Gservices setting.
2009-09-23 16:37:57 -04:00
Sanjay Jeyakumar
b34a3a0805 Remove the GDD Gservices setting. 2009-09-23 13:34:20 -07:00
Android (Google) Code Review
193a626189 Merge change 26537 into eclair
* changes:
  add hashCode() and equals() to Rfc822Token, as well as a convenience tokenizer method to Rfc822Tokenizer, as part of a calendar guest bugfix.
2009-09-23 16:17:02 -04:00