Commit Graph

9896 Commits

Author SHA1 Message Date
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
62ebb5a0a0 am 7475be4b: Merge change 26636 into eclair
Merge commit '7475be4bc239929aa49235e223807d5447674efd' into eclair-plus-aosp

* commit '7475be4bc239929aa49235e223807d5447674efd':
  Fix #2101821: Cut labels of menu items in "SnapTell" market app.
2009-09-23 11:59:55 -07:00
Android (Google) Code Review
7475be4bc2 Merge change 26636 into eclair
* changes:
  Fix #2101821: Cut labels of menu items in "SnapTell" market app.
2009-09-23 14:45:17 -04:00
Wei Huang
990057877d am 9bb05ab9: am df586217: Merge change 26446 into eclair
Merge commit '9bb05ab9d5bcfdd214bbdce89cd87877f5e9b452'

* commit '9bb05ab9d5bcfdd214bbdce89cd87877f5e9b452':
  fix bug 2100169: add the line1 number + "/TYPE=PLMN" when sending a pdu.
2009-09-23 11:39:32 -07:00
Christopher Tate
fb554aca11 am a0b07d2c: am 13006be1: Merge change 26457 into eclair
Merge commit 'a0b07d2c0297e8f10c2d98428b2acacb531cd5a7'

* commit 'a0b07d2c0297e8f10c2d98428b2acacb531cd5a7':
  Don't restore any setting that we don't think should be backed up
2009-09-23 11:38:07 -07:00
Ray Chen
94cdc3d0e2 am 830207ca: Merge change 25635 into eclair
Merge commit '830207cab4047431d7a38443531a3a912bfecf3a' into eclair-plus-aosp

* commit '830207cab4047431d7a38443531a3a912bfecf3a':
  Add new thumbnail API.
2009-09-23 11:38:06 -07:00
Evan Millar
383c5bf04c am a1da80c0: am 5bb45740: Merge change 26459 into eclair
Merge commit 'a1da80c0f1d90a4b0026c635db2aaa895712890e'

* commit 'a1da80c0f1d90a4b0026c635db2aaa895712890e':
  New fasttrack assets.
2009-09-23 11:37:51 -07:00
Costin Manolache
6747acd064 am cd757401: am 4271c7c3: Merge change 26449 into eclair
Merge commit 'cd7574014c874d2bc75be8a3f3c1bab862205999'

* commit 'cd7574014c874d2bc75be8a3f3c1bab862205999':
  Keep track of 'initial' sync state in SyncStatusInfo
2009-09-23 11:37:38 -07:00
Mark Wagner
35e2e2e980 am af2c5915: am 63147705: Merge change 26437 into eclair
Merge commit 'af2c5915a57454ab0762755d85171d912e753063'

* commit 'af2c5915a57454ab0762755d85171d912e753063':
  Don't show the badge background when we have no uri, email, or phone.
2009-09-23 11:36:13 -07:00
Christopher Tate
ce235e806c am cd8e04d7: am b03b3bbd: If backup fails, reenqueue all of the affected packages for next time.
Merge commit 'cd8e04d7871eb9303de78af0a2ecd7bce29d2e58'

* commit 'cd8e04d7871eb9303de78af0a2ecd7bce29d2e58':
  If backup fails, reenqueue all of the affected packages for next time.
2009-09-23 11:35:58 -07:00
Karl Rosaen
fbb49d72a4 am b978ee3c: am 36dac6ae: Merge change 26390 into eclair
Merge commit 'b978ee3c253499f2ed4af7bb1f54b8b7ae1ad99c'

* commit 'b978ee3c253499f2ed4af7bb1f54b8b7ae1ad99c':
  Bring the dimples back, and make the "spin around" animation have a fling feeling.
2009-09-23 11:35:22 -07:00
Dianne Hackborn
d2933624c5 am 353bf452: am 9bfb7075: Various fixes and improvements to window, activity.
Merge commit '353bf45201e9440b61de8f89c92d1823ba55a198'

* commit '353bf45201e9440b61de8f89c92d1823ba55a198':
  Various fixes and improvements to window, activity.
2009-09-23 11:34:52 -07:00
Bob Lee
a37b361693 am 3136d4b0: Merge change 26635 into eclair
Merge commit '3136d4b0108deaca5ab525881de47d2979911131' into eclair-plus-aosp

* commit '3136d4b0108deaca5ab525881de47d2979911131':
  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-23 11:34:36 -07:00
Leon Scroggins
2fd4943847 am 6d181166: Merge change 26615 into eclair
Merge commit '6d181166a2e5c819e274397f90e33d340061750f' into eclair-plus-aosp

* commit '6d181166a2e5c819e274397f90e33d340061750f':
  Provide a getter to access the width of the HTML document.
2009-09-23 11:34:20 -07:00
Derek Sollenberger
99e5103e14 am effd391a: am c0b8a96d: launching plugin activity when a plugin requests to go full screen.
Merge commit 'effd391a96f473e113df9c116a98ceeb6e067ff7'

* commit 'effd391a96f473e113df9c116a98ceeb6e067ff7':
  launching plugin activity when a plugin requests to go full screen.
2009-09-23 11:33:31 -07:00
Jaikumar Ganesh
815ec2104a am d7c4cf5f: am 34ca22d2: Merge change 26366 into eclair
Merge commit 'd7c4cf5fdfe0d26c0b40ba8823b8ea321a486367'

* commit 'd7c4cf5fdfe0d26c0b40ba8823b8ea321a486367':
  Set the bonding for incoming connections only when authentication is requested.
2009-09-23 11:32:43 -07:00
Dan Egnor
50db8dabda am ee852f5f: am 6c644f24: Merge change 26379 into eclair
Merge commit 'ee852f5fbd887c8a566703300b0fed141351575f'

* commit 'ee852f5fbd887c8a566703300b0fed141351575f':
  Add parameter for the restore set (device id) data is being restored from to the restore_start event
2009-09-23 11:32:26 -07:00
Bjorn Bringert
6dc970e89c am 668b5554: am 916b2ca9: Merge change 26355 into eclair
Merge commit '668b55543b6fcae815edc217a839804f47ebb738'

* commit '668b55543b6fcae815edc217a839804f47ebb738':
  Use FLAG_ACTIVITY_CLEAR_TOP when launching search suggestions.
2009-09-23 11:31:58 -07:00
Jason Sams
ad853bcb40 am e7d3be7b: am 78f180af: Merge change 26414 into eclair
Merge commit 'e7d3be7bae2d9cdc82b49727eabaa44e434fc590'

* commit 'e7d3be7bae2d9cdc82b49727eabaa44e434fc590':
  Update viewport when height or width change.
2009-09-23 11:31:40 -07:00
Bjorn Bringert
38c344ed22 am c216f4a0: am af1eb148: Merge change 25465 into eclair
Merge commit 'c216f4a0238c2bd3720dbb5c5f04a52ac7691e59'

* commit 'c216f4a0238c2bd3720dbb5c5f04a52ac7691e59':
  Reset typeface when changing from visible password inputType
2009-09-23 11:31:22 -07:00
Android (Google) Code Review
830207cab4 Merge change 25635 into eclair
* changes:
  Add new thumbnail API.
2009-09-23 14:31:04 -04:00
Yu Shan Emily Lau
f97eb8f932 am 5653e41e: am 008fc5d1: Merge change 26332 into eclair
Merge commit '5653e41e71a07c104da3f01e5a022198ee39dafe'

* commit '5653e41e71a07c104da3f01e5a022198ee39dafe':
  1) Add the wma / wmv profile reader.
2009-09-23 11:30:58 -07:00
Andrei Popescu
42f83146fb am 22d3ba8a: 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 '22d3ba8ac6faddcdad279b775a5f6237c0d2132f'

* commit '22d3ba8ac6faddcdad279b775a5f6237c0d2132f':
  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-23 11:30:24 -07:00
Grace Kloba
160d35ede4 am 1be0eb6f: am 24a3ff95: Change double tap toast to long toast.
Merge commit '1be0eb6fc9a2933e7a16cc5bb05e24c6bd09ff62'

* commit '1be0eb6fc9a2933e7a16cc5bb05e24c6bd09ff62':
  Change double tap toast to long toast.
2009-09-23 11:30:10 -07:00
Android (Google) Code Review
3136d4b010 Merge change 26635 into eclair
* changes:
  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-23 14:28:16 -04:00
Dianne Hackborn
b8a9f12802 Fix #2101821: Cut labels of menu items in "SnapTell" market app.
Ummmm...  this turns out to be pretty bad.  NinePatchDrawable was not
scaling its reported padding for compatibility mode, causing spacing
to be off.  All over the place.  This change should improve things quite
a bit (and magically makes nearly all of the menu flaws go away).

Change-Id: I94a8310d95b908b6f087db97d9afaed654ca6de5
2009-09-23 11:27:06 -07:00