Merge commit '2fd4943847d0209bef39171c1278ad6c86072dcc'
* commit '2fd4943847d0209bef39171c1278ad6c86072dcc':
Provide a getter to access the width of the HTML document.
Merge commit 'c3bfa6048da74dd54f9147f6600ad0537cbe7bd6'
* commit 'c3bfa6048da74dd54f9147f6600ad0537cbe7bd6':
add definition for Mms.TempStorage content uri and filename.
Merge commit 'ea2aabf1b21f756f06b0b7535c80807d986683d8'
* commit 'ea2aabf1b21f756f06b0b7535c80807d986683d8':
Move destroying the web view to the WVC thread (previously it was on the UI thread)
Merge commit '90c0d0ab42ec909290abcc168ac0deded05a1141'
* commit '90c0d0ab42ec909290abcc168ac0deded05a1141':
In calcOurContentVisibleRect, account for the visible title bar.
Merge commit 'e7244b0482f6bdb21fc27aca078372333d0de5a2'
* commit 'e7244b0482f6bdb21fc27aca078372333d0de5a2':
Back button in search always goes back or closes search
Merge commit '8f0d64693e155b1db2ff89cde1f050b4b6b0ec7a'
* commit '8f0d64693e155b1db2ff89cde1f050b4b6b0ec7a':
Fix bug where onStartCommand() was never called with a null intent.
Merge commit 'f73afeeec3d4c841207ffc4e5415b8fe4555a5a1'
* commit 'f73afeeec3d4c841207ffc4e5415b8fe4555a5a1':
fix the logic for starting a sync after the accounts changed
Merge commit 'd5b16418ed7dcdeeba108bad0e4c78ef25ded52c'
* commit 'd5b16418ed7dcdeeba108bad0e4c78ef25ded52c':
- make an AccountManager per context, not one per process
Merge commit '2b0d6e7e43f92b1fb1dea207b3eb4121369594c3'
* commit '2b0d6e7e43f92b1fb1dea207b3eb4121369594c3':
Add support for thumbnails to WallpaperInfo.
Merge commit 'cd7574014c874d2bc75be8a3f3c1bab862205999'
* commit 'cd7574014c874d2bc75be8a3f3c1bab862205999':
Keep track of 'initial' sync state in SyncStatusInfo
Merge commit 'af2c5915a57454ab0762755d85171d912e753063'
* commit 'af2c5915a57454ab0762755d85171d912e753063':
Don't show the badge background when we have no uri, email, or phone.
Merge commit '353bf45201e9440b61de8f89c92d1823ba55a198'
* commit '353bf45201e9440b61de8f89c92d1823ba55a198':
Various fixes and improvements to window, activity.
Merge commit '6d181166a2e5c819e274397f90e33d340061750f' into eclair-plus-aosp
* commit '6d181166a2e5c819e274397f90e33d340061750f':
Provide a getter to access the width of the HTML document.
Merge commit 'effd391a96f473e113df9c116a98ceeb6e067ff7'
* commit 'effd391a96f473e113df9c116a98ceeb6e067ff7':
launching plugin activity when a plugin requests to go full screen.
Merge commit 'd7c4cf5fdfe0d26c0b40ba8823b8ea321a486367'
* commit 'd7c4cf5fdfe0d26c0b40ba8823b8ea321a486367':
Set the bonding for incoming connections only when authentication is requested.
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.
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 'd2cd9467b876777d512911fadeb948e58b9de257' into eclair-plus-aosp
* commit 'd2cd9467b876777d512911fadeb948e58b9de257':
Suppress warning around old vcard code.
