Merge commit 'b06c9a8c8e59067edd3c6b5af574ff382a4ef656' into eclair-plus-aosp
* commit 'b06c9a8c8e59067edd3c6b5af574ff382a4ef656':
add definition for Mms.TempStorage content uri and filename.
Merge commit 'b82665e78f3a4f08e7b620b85246b7925097386b' into eclair-plus-aosp
* commit 'b82665e78f3a4f08e7b620b85246b7925097386b':
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
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)
Merge commit 'd4c00a173aacf815bb8c5bcffaab21da61ac7d66' into eclair-plus-aosp
* commit 'd4c00a173aacf815bb8c5bcffaab21da61ac7d66':
In calcOurContentVisibleRect, account for the visible title bar.
Merge commit 'dbce92ab0bc874420f237cc06f615470080ebc6a' into eclair-plus-aosp
* commit 'dbce92ab0bc874420f237cc06f615470080ebc6a':
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
Merge commit 'c413d54cd9283778e6d73965a1d1d5f63ba62ec3' into eclair-plus-aosp
* commit 'c413d54cd9283778e6d73965a1d1d5f63ba62ec3':
Fix bug where onStartCommand() was never called with a null intent.
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.
Merge commit 'd2cd9467b876777d512911fadeb948e58b9de257' into eclair-plus-aosp
* commit 'd2cd9467b876777d512911fadeb948e58b9de257':
Suppress warning around old vcard code.
Merge commit 'be3bceb5b908c23eeda5a8d04d2ea3d43cc7ed10' into eclair-plus-aosp
* commit 'be3bceb5b908c23eeda5a8d04d2ea3d43cc7ed10':
fix the logic for starting a sync after the accounts changed
Merge commit '3de07024c80fb8a983d4a804ff6d14a49b3f7979' into eclair-plus-aosp
* commit '3de07024c80fb8a983d4a804ff6d14a49b3f7979':
- make an AccountManager per context, not one per process
Merge commit '32f76f34075450c03c68fc1f65e395d5eddd6d51' into eclair-plus-aosp
* commit '32f76f34075450c03c68fc1f65e395d5eddd6d51':
Add a new IResourceValue that knows about the density.
Merge commit '7c47adefea3101876f747926e7631406b4fbf45e' into eclair-plus-aosp
* commit '7c47adefea3101876f747926e7631406b4fbf45e':
Dock screen on config can now select AC or USB.
Merge commit '520ca7e503498f394ad67faf8caecea25a1930ea' into eclair-plus-aosp
* commit '520ca7e503498f394ad67faf8caecea25a1930ea':
Add support for thumbnails to WallpaperInfo.
Merge commit 'c3c6621a2cf2f0d40d062dcad1c9f65485473841' into eclair-plus-aosp
* commit 'c3c6621a2cf2f0d40d062dcad1c9f65485473841':
Setting the default HTTP user agent at runtime init.
This will allow the layoutlib to resize bitmaps that are
not in the native density of the rendering.
Change-Id: If9dca6d51cd93a2083c96fce3ac64335ec6ad801
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).
Merge commit 'df5862173c03f0d9595a2a5cb56c4af407d893dd' into eclair-plus-aosp
* commit 'df5862173c03f0d9595a2a5cb56c4af407d893dd':
fix bug 2100169: add the line1 number + "/TYPE=PLMN" when sending a pdu.
Merge commit '13006be19ef35f46effd10c422204cfe144136d6' into eclair-plus-aosp
* commit '13006be19ef35f46effd10c422204cfe144136d6':
Don't restore any setting that we don't think should be backed up
