4312 Commits

Author SHA1 Message Date
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
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
Android (Google) Code Review
830207cab4 Merge change 25635 into eclair
* changes:
  Add new thumbnail API.
2009-09-23 14:31:04 -04:00
Android (Google) Code Review
6d181166a2 Merge change 26615 into eclair
* changes:
  Provide a getter to access the width of the HTML document.
2009-09-23 14:24:07 -04:00
Ray Chen
00c575a3fc Add new thumbnail API. 2009-09-23 11:23:45 -07:00
Daniel Sandler
611078906c 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
Leon Scroggins
ea96d1e27f Provide a getter to access the width of the HTML document.
Necessary to scale thumbnail pictures to show the full page width.

Change-Id: I631e880b09fe66403ea71bf5e019899a180e6a53
2009-09-23 14:14:34 -04:00
Android (Google) Code Review
9d12fdb1b5 Merge change 26625 into eclair
* changes:
  Fix http://b/2139600 (expander indicators misaligned).
2009-09-23 14:12:37 -04:00
Daniel Sandler
2a237a9f5c Fix http://b/2139600 (expander indicators misaligned).
Culprit: busted 9-patch.
2009-09-23 13:56:16 -04:00
Wei Huang
c3bfa6048d 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
3c385116e9 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
b06c9a8c8e Merge change 26579 into eclair
* changes:
  add definition for Mms.TempStorage content uri and filename.
2009-09-23 13:17:14 -04:00
Cary Clark
b82665e78f don't allow min scale to go to infinity
When a new picture is received, the min zoom scale is set.
One of the many choices divides by draw.mMinPrefWidth, even
if it is zero. Add a check to require it to be greater than
zero before using it as a ratio component.

fixes http://b/issue?id=2138786
2009-09-23 13:09:34 -04:00
Ben Murdoch
ea2aabf1b2 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
c28e3a670f 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
Wei Huang
d588cb7fc3 add definition for Mms.TempStorage content uri and filename.
Change-Id: Idfab085f2ecc8c7c835208805ccf1d94d6380780
2009-09-23 09:51:49 -07:00
Leon Scroggins
90c0d0ab42 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
d4c00a173a Merge change 26590 into eclair
* changes:
  In calcOurContentVisibleRect, account for the visible title bar.
2009-09-23 11:58:46 -04:00
Bjorn Bringert
e7244b0482 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
dbce92ab0b Merge change 26587 into eclair
* changes:
  Back button in search always goes back or closes search
2009-09-23 11:20:03 -04:00
Ben Murdoch
3dba1e4d81 Move destroying the web view to the WVC thread (previously it was on the UI thread)
Change-Id: I5a48734c6a244eadd1d60659f8e02ebb889a8fc1
2009-09-23 16:14:37 +01:00
Leon Scroggins
37df6a8328 In calcOurContentVisibleRect, account for the visible title bar.
Fixes http://b/issue?id=2137879 and http://b/issue?id=2135469

Change-Id: I6a4b2f90ffa8d37adbe86a2fd19d141c4136213c
2009-09-23 10:53:42 -04:00
Bjorn Bringert
077357ccf0 Back button in search always goes back or closes search
Before, the back button had different behavior depending on
which part of the search dialog had focus, and depending on
whether there were more suggestions than could fit in the
visible space in the drop-down.

This change makes the behavior of the BACK button more
predictable, by always going back to QSB when pivoted
into a source, and closing the search dialog when in
QSB.

Fixes http://b/issue?id=2126526
"One tap of back button when entering text to search
should always take you back to previous page"

Change-Id: I7b3553122eaa1a5d87ac966d5ab2a9f432063cc9
2009-09-23 14:59:02 +01:00
Dianne Hackborn
8f0d64693e 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
Dianne Hackborn
fed534ee5d Fix bug where onStartCommand() was never called with a null intent.
Also clean up some of the service java docs.

Change-Id: I40e7d713e2393f7ee1db9822da8f07fb6304a9e4
2009-09-23 00:42:12 -07:00
Daisuke Miyakawa
b452ea0e68 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
d2cd9467b8 Suppress warning around old vcard code. 2009-09-22 23:14:52 -07:00
Daisuke Miyakawa
4337a244c4 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
90b765807e 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
Daisuke Miyakawa
c32897a6ea Suppress Performance log emitted by vCard importer. 2009-09-22 22:22:34 -07:00
Android (Google) Code Review
3559c14c9c Merge change 26549 into eclair
* changes:
  Add Website.TYPE information.
2009-09-23 01:17:31 -04:00
Daisuke Miyakawa
7a9e2f20af Add Website.TYPE information.
Related internal issue number: 2131626
2009-09-22 21:51:40 -07:00
Fred Quintana
f73afeeec3 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
be3bceb5b9 fix the logic for starting a sync after the accounts changed 2009-09-22 21:14:48 -07:00
Fred Quintana
d5b16418ed 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
3de07024c8 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
Dianne Hackborn
648297ff5d 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
7c47adefea 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
2b0d6e7e43 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
7ca38352b9 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
520ca7e503 Merge change 26415 into eclair
* changes:
  Add support for thumbnails to WallpaperInfo.
2009-09-22 22:06:38 -04:00
Android (Google) Code Review
c3c6621a2c Merge change 25879 into eclair
* changes:
  Setting the default HTTP user agent at runtime init.
2009-09-22 22:04:05 -04:00
Dianne Hackborn
99f7eb453c Dock screen on config can now select AC or USB.
Change-Id: Ifae9af4eb0295ba8e46c65879440b0da543b18e6
2009-09-22 18:59:35 -07:00
Daniel Sandler
465ccb8a40 Add support for thumbnails to WallpaperInfo.
Clean up the Gallery to show thumbnails appropriately; still using FPO artwork
for wallpapers without thumbnails.

This change introduces a new "thumbnail" attribute to the API (used
in wallpaper metadata to point to the thumbnail drawable resource).
2009-09-22 20:56:10 -04:00
Wei Huang
9bb05ab9d5 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
df5862173c 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
Evan Millar
a1da80c0f1 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
cd7574014c 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
5bb45740d9 Merge change 26459 into eclair
* changes:
  New fasttrack assets.
2009-09-22 18:32:46 -04:00
Android (Google) Code Review
4271c7c36b Merge change 26449 into eclair
* changes:
  Keep track of 'initial' sync state in SyncStatusInfo
2009-09-22 18:28:58 -04:00