Commit Graph

5504 Commits

Author SHA1 Message Date
Daniel Sandler
0ea2c11d1b am 9d12fdb1: Merge change 26625 into eclair
Merge commit '9d12fdb1b55500d69df5a1bdc2fcba57a2f1876c' into eclair-plus-aosp

* commit '9d12fdb1b55500d69df5a1bdc2fcba57a2f1876c':
  Fix http://b/2139600 (expander indicators misaligned).
2009-09-23 11:21:27 -07:00
Android (Google) Code Review
cff4f09868 Merge change 26625 into eclair
* changes:
  Fix http://b/2139600 (expander indicators misaligned).
2009-09-23 14:12:37 -04:00
Marco Nelissen
a455793a8d fbDev wasn't initialized of hw_get_module failed, but was then used anyway. 2009-09-23 10:56:51 -07:00
Xavier Ducrohet
017f957527 am 0acf9a5b: Merge change 26539 into eclair
Merge commit '0acf9a5b2f81413641d3d139ae6fd5f9df621e5f' into eclair-plus-aosp

* commit '0acf9a5b2f81413641d3d139ae6fd5f9df621e5f':
  Add density value to density enum.
2009-09-23 10:40:15 -07:00
Android (Google) Code Review
3880515d82 Merge change 26539 into eclair
* changes:
  Add density value to density enum.
2009-09-23 13:33:06 -04:00
Wei Huang
1e65af94ba am b06c9a8c: Merge change 26579 into eclair
Merge commit 'b06c9a8c8e59067edd3c6b5af574ff382a4ef656' into eclair-plus-aosp

* commit 'b06c9a8c8e59067edd3c6b5af574ff382a4ef656':
  add definition for Mms.TempStorage content uri and filename.
2009-09-23 10:24:21 -07:00
Cary Clark
cd63c46167 am b82665e7: don\'t allow min scale to go to infinity
Merge commit 'b82665e78f3a4f08e7b620b85246b7925097386b' into eclair-plus-aosp

* commit 'b82665e78f3a4f08e7b620b85246b7925097386b':
  don't allow min scale to go to infinity
2009-09-23 10:19:21 -07:00
Android (Google) Code Review
904ab724b4 Merge change 26579 into eclair
* changes:
  add definition for Mms.TempStorage content uri and filename.
2009-09-23 13:17:14 -04:00
Ben Murdoch
8c6b751766 am c28e3a67: Merge change 26595 into eclair
Merge commit 'c28e3a670fd993d5465504ed48e9e89bb24823b0' into eclair-plus-aosp

* commit 'c28e3a670fd993d5465504ed48e9e89bb24823b0':
  Move destroying the web view to the WVC thread (previously it was on the UI thread)
2009-09-23 09:59:26 -07:00
Android (Google) Code Review
f2b4976a53 Merge change 26595 into eclair
* changes:
  Move destroying the web view to the WVC thread (previously it was on the UI thread)
2009-09-23 12:53:31 -04:00
Leon Scroggins
cf1fe3c939 am d4c00a17: Merge change 26590 into eclair
Merge commit 'd4c00a173aacf815bb8c5bcffaab21da61ac7d66' into eclair-plus-aosp

* commit 'd4c00a173aacf815bb8c5bcffaab21da61ac7d66':
  In calcOurContentVisibleRect, account for the visible title bar.
2009-09-23 09:04:57 -07:00
Android (Google) Code Review
98d4e410a4 Merge change 26590 into eclair
* changes:
  In calcOurContentVisibleRect, account for the visible title bar.
2009-09-23 11:58:46 -04:00
Bjorn Bringert
d0c7d36192 am dbce92ab: Merge change 26587 into eclair
Merge commit 'dbce92ab0bc874420f237cc06f615470080ebc6a' into eclair-plus-aosp

* commit 'dbce92ab0bc874420f237cc06f615470080ebc6a':
  Back button in search always goes back or closes search
2009-09-23 08:29:14 -07:00
Android (Google) Code Review
adebf5ae4b Merge change 26587 into eclair
* changes:
  Back button in search always goes back or closes search
2009-09-23 11:20:03 -04:00
Dianne Hackborn
54e7389550 am c413d54c: Merge change 26573 into eclair
Merge commit 'c413d54cd9283778e6d73965a1d1d5f63ba62ec3' into eclair-plus-aosp

* commit 'c413d54cd9283778e6d73965a1d1d5f63ba62ec3':
  Fix bug where onStartCommand() was never called with a null intent.
2009-09-23 01:05:01 -07:00
Android (Google) Code Review
420d010f1a Merge change 26573 into eclair
* changes:
  Fix bug where onStartCommand() was never called with a null intent.
2009-09-23 03:57:03 -04:00
Jesse Wilson
b478619081 am ecaf00e8: DO NOT MERGE: Copy 4.xml to 5.xml to allow Eclair to diverge from Donut.
Merge commit 'ecaf00e88ffd15c8471b41e7349ab37a125c9333' into eclair-plus-aosp

* commit 'ecaf00e88ffd15c8471b41e7349ab37a125c9333':
  DO NOT MERGE: Copy 4.xml to 5.xml to allow Eclair to diverge from Donut.
2009-09-23 00:46:17 -07:00
Daisuke Miyakawa
1aa3a4ab5a am d2cd9467: Suppress warning around old vcard code.
Merge commit 'd2cd9467b876777d512911fadeb948e58b9de257' into eclair-plus-aosp

* commit 'd2cd9467b876777d512911fadeb948e58b9de257':
  Suppress warning around old vcard code.
2009-09-22 23:26:14 -07:00
Daisuke Miyakawa
2162904468 am c32897a6: Suppress Performance log emitted by vCard importer.
Merge commit 'c32897a6ead7e898dd37ac8bcec72e4cf89dadfa' into eclair-plus-aosp

* commit 'c32897a6ead7e898dd37ac8bcec72e4cf89dadfa':
  Suppress Performance log emitted by vCard importer.
2009-09-22 22:34:03 -07:00
Daisuke Miyakawa
75982b3a7e am 3559c14c: Merge change 26549 into eclair
Merge commit '3559c14c9c056b51e0def93625987e0a42c618f7' into eclair-plus-aosp

* commit '3559c14c9c056b51e0def93625987e0a42c618f7':
  Add Website.TYPE information.
2009-09-22 22:24:18 -07:00
Android (Google) Code Review
8ea1996cfe Merge change 26549 into eclair
* changes:
  Add Website.TYPE information.
2009-09-23 01:17:31 -04:00
Wei Huang
2bfb5013ca am a1dfa7f4: Merge change 26550 into eclair
Merge commit 'a1dfa7f4a108a7823d8da49ba5ea1777e283a724' into eclair-plus-aosp

* commit 'a1dfa7f4a108a7823d8da49ba5ea1777e283a724':
  fix bug 2134367: failing phone number compare test.
2009-09-22 22:10:22 -07:00
Android (Google) Code Review
d8dc3120ad Merge change 26550 into eclair
* changes:
  fix bug 2134367: failing phone number compare test.
2009-09-23 01:01:18 -04:00
Fred Quintana
e87d54d475 am be3bceb5: fix the logic for starting a sync after the accounts changed
Merge commit 'be3bceb5b908c23eeda5a8d04d2ea3d43cc7ed10' into eclair-plus-aosp

* commit 'be3bceb5b908c23eeda5a8d04d2ea3d43cc7ed10':
  fix the logic for starting a sync after the accounts changed
2009-09-22 21:22:47 -07:00
Fred Quintana
fcf7b71e58 am 3de07024: Merge change 26456 into eclair
Merge commit '3de07024c80fb8a983d4a804ff6d14a49b3f7979' into eclair-plus-aosp

* commit '3de07024c80fb8a983d4a804ff6d14a49b3f7979':
  - make an AccountManager per context, not one per process
2009-09-22 20:26:12 -07:00
Android (Google) Code Review
f72e082ce2 Merge change 26456 into eclair
* changes:
  - make an AccountManager per context, not one per process - enhance the comment for addOnAccountsUpdatedListener()
2009-09-22 23:20:25 -04:00
Xavier Ducrohet
addb4abd81 am 32f76f34: Merge change 26517 into eclair
Merge commit '32f76f34075450c03c68fc1f65e395d5eddd6d51' into eclair-plus-aosp

* commit '32f76f34075450c03c68fc1f65e395d5eddd6d51':
  Add a new IResourceValue that knows about the density.
2009-09-22 19:56:31 -07:00
Android (Google) Code Review
8a095e1d6d Merge change 26517 into eclair
* changes:
  Add a new IResourceValue that knows about the density.
2009-09-22 22:51:25 -04:00
Dianne Hackborn
f91018d000 am 7c47adef: Merge change 26527 into eclair
Merge commit '7c47adefea3101876f747926e7631406b4fbf45e' into eclair-plus-aosp

* commit '7c47adefea3101876f747926e7631406b4fbf45e':
  Dock screen on config can now select AC or USB.
2009-09-22 19:31:58 -07:00
Android (Google) Code Review
f38502c71c Merge change 26527 into eclair
* changes:
  Dock screen on config can now select AC or USB.
2009-09-22 22:24:10 -04:00
Daniel Sandler
d97d38a1c7 am 520ca7e5: Merge change 26415 into eclair
Merge commit '520ca7e503498f394ad67faf8caecea25a1930ea' into eclair-plus-aosp

* commit '520ca7e503498f394ad67faf8caecea25a1930ea':
  Add support for thumbnails to WallpaperInfo.
2009-09-22 19:12:52 -07:00
Jesse Wilson
613e2367d2 am c3c6621a: Merge change 25879 into eclair
Merge commit 'c3c6621a2cf2f0d40d062dcad1c9f65485473841' into eclair-plus-aosp

* commit 'c3c6621a2cf2f0d40d062dcad1c9f65485473841':
  Setting the default HTTP user agent at runtime init.
2009-09-22 19:12:40 -07:00
Android (Google) Code Review
a99fb28852 Merge change 26415 into eclair
* changes:
  Add support for thumbnails to WallpaperInfo.
2009-09-22 22:06:38 -04:00
Android (Google) Code Review
62909fdf31 Merge change 25879 into eclair
* changes:
  Setting the default HTTP user agent at runtime init.
2009-09-22 22:04:05 -04:00
Wei Huang
aab431be59 am df586217: Merge change 26446 into eclair
Merge commit 'df5862173c03f0d9595a2a5cb56c4af407d893dd' into eclair-plus-aosp

* commit 'df5862173c03f0d9595a2a5cb56c4af407d893dd':
  fix bug 2100169: add the line1 number + "/TYPE=PLMN" when sending a pdu.
2009-09-22 17:23:51 -07:00
Android (Google) Code Review
645e092dde Merge change 26446 into eclair
* changes:
  fix bug 2100169: add the line1 number + "/TYPE=PLMN" when sending a pdu.
2009-09-22 20:19:14 -04:00
Christopher Tate
7a77e91aad am 13006be1: Merge change 26457 into eclair
Merge commit '13006be19ef35f46effd10c422204cfe144136d6' into eclair-plus-aosp

* commit '13006be19ef35f46effd10c422204cfe144136d6':
  Don't restore any setting that we don't think should be backed up
2009-09-22 15:55:37 -07:00
Evan Millar
80a6ca15d3 am 5bb45740: Merge change 26459 into eclair
Merge commit '5bb45740d9554298dc19d8275c200f9fddbd2d6e' into eclair-plus-aosp

* commit '5bb45740d9554298dc19d8275c200f9fddbd2d6e':
  New fasttrack assets.
2009-09-22 15:50:56 -07:00
Costin Manolache
d168a80b05 am 4271c7c3: Merge change 26449 into eclair
Merge commit '4271c7c36bc6c3acef1a7d0926a5cf300e5efa4a' into eclair-plus-aosp

* commit '4271c7c36bc6c3acef1a7d0926a5cf300e5efa4a':
  Keep track of 'initial' sync state in SyncStatusInfo
2009-09-22 15:50:31 -07:00
Android (Google) Code Review
4f954e89e9 Merge change 26457 into eclair
* changes:
  Don't restore any setting that we don't think should be backed up
2009-09-22 18:47:14 -04:00
Android (Google) Code Review
b7d8f999ba Merge change 26459 into eclair
* changes:
  New fasttrack assets.
2009-09-22 18:32:46 -04:00
Android (Google) Code Review
f38f760972 Merge change 26449 into eclair
* changes:
  Keep track of 'initial' sync state in SyncStatusInfo
2009-09-22 18:28:58 -04:00
Mark Wagner
27872004ab am 63147705: Merge change 26437 into eclair
Merge commit '63147705bc2893d6ad43270e04beb9ee01e2ad53' into eclair-plus-aosp

* commit '63147705bc2893d6ad43270e04beb9ee01e2ad53':
  Don't show the badge background when we have no uri, email, or phone.
2009-09-22 14:39:02 -07:00
Christopher Tate
d08b3ba065 am b03b3bbd: If backup fails, reenqueue all of the affected packages for next time.
Merge commit 'b03b3bbd6833f7c6fbd8100fa3958220554f66a3' into eclair-plus-aosp

* commit 'b03b3bbd6833f7c6fbd8100fa3958220554f66a3':
  If backup fails, reenqueue all of the affected packages for next time.
2009-09-22 14:38:51 -07:00
Android (Google) Code Review
58807ca3b7 Merge change 26437 into eclair
* changes:
  Don't show the badge background when we have no uri, email, or phone.
2009-09-22 17:28:59 -04:00
Karl Rosaen
446cf5f1a9 am 36dac6ae: Merge change 26390 into eclair
Merge commit '36dac6ae8e005f0247e44345727d1580b1623127' into eclair-plus-aosp

* commit '36dac6ae8e005f0247e44345727d1580b1623127':
  Bring the dimples back, and make the "spin around" animation have a fling feeling.
2009-09-22 14:08:35 -07:00
Dianne Hackborn
814accd1b2 am 9bfb7075: Various fixes and improvements to window, activity.
Merge commit '9bfb707597898f54722460b48588007b682f3e2a' into eclair-plus-aosp

* commit '9bfb707597898f54722460b48588007b682f3e2a':
  Various fixes and improvements to window, activity.
2009-09-22 14:08:22 -07:00
Android (Google) Code Review
f8fac5acb8 Merge change 26390 into eclair
* changes:
  Bring the dimples back, and make the "spin around" animation have a fling feeling.
2009-09-22 17:01:13 -04:00
Derek Sollenberger
9fdcdbd8c1 am c0b8a96d: launching plugin activity when a plugin requests to go full screen.
Merge commit 'c0b8a96d28c55cb51e4f9e1f85c8d3ecf1ff13bf' into eclair-plus-aosp

* commit 'c0b8a96d28c55cb51e4f9e1f85c8d3ecf1ff13bf':
  launching plugin activity when a plugin requests to go full screen.
2009-09-22 13:39:39 -07:00
Jaikumar Ganesh
63807d1f85 am 34ca22d2: Merge change 26366 into eclair
Merge commit '34ca22d25303633c855a738409ea2f8e3f79a713' into eclair-plus-aosp

* commit '34ca22d25303633c855a738409ea2f8e3f79a713':
  Set the bonding for incoming connections only when authentication is requested.
2009-09-22 13:08:08 -07:00