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 '36b10bf525ed6d9819e696509530f19fb3d15275'
* commit '36b10bf525ed6d9819e696509530f19fb3d15275':
DO NOT MERGE: Copy 4.xml to 5.xml to allow Eclair to diverge from Donut.
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 '296e7b951914f983b4d063da02d38162ac01abd0'
* commit '296e7b951914f983b4d063da02d38162ac01abd0':
Add a new IResourceValue that knows about the density.
Merge commit '648297ff5d1a56f08985d26d58f1471e2ff0ba86'
* commit '648297ff5d1a56f08985d26d58f1471e2ff0ba86':
Dock screen on config can now select AC or USB.
Merge commit '2b0d6e7e43f92b1fb1dea207b3eb4121369594c3'
* commit '2b0d6e7e43f92b1fb1dea207b3eb4121369594c3':
Add support for thumbnails to WallpaperInfo.
Merge commit '7ca38352b911bfd299f5862da930e388eba7f903'
* commit '7ca38352b911bfd299f5862da930e388eba7f903':
Setting the default HTTP user agent at runtime init.
Merge commit '9bb05ab9d5bcfdd214bbdce89cd87877f5e9b452'
* commit '9bb05ab9d5bcfdd214bbdce89cd87877f5e9b452':
fix bug 2100169: add the line1 number + "/TYPE=PLMN" when sending a pdu.
Merge commit 'a0b07d2c0297e8f10c2d98428b2acacb531cd5a7'
* commit 'a0b07d2c0297e8f10c2d98428b2acacb531cd5a7':
Don't restore any setting that we don't think should be backed up
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 'cd8e04d7871eb9303de78af0a2ecd7bce29d2e58'
* commit 'cd8e04d7871eb9303de78af0a2ecd7bce29d2e58':
If backup fails, reenqueue all of the affected packages for next time.
Merge commit 'b978ee3c253499f2ed4af7bb1f54b8b7ae1ad99c'
* commit 'b978ee3c253499f2ed4af7bb1f54b8b7ae1ad99c':
Bring the dimples back, and make the "spin around" animation have a fling feeling.
Merge commit '353bf45201e9440b61de8f89c92d1823ba55a198'
* commit '353bf45201e9440b61de8f89c92d1823ba55a198':
Various fixes and improvements to window, activity.
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 'ee852f5fbd887c8a566703300b0fed141351575f'
* commit 'ee852f5fbd887c8a566703300b0fed141351575f':
Add parameter for the restore set (device id) data is being restored from to the restore_start event
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 '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.
