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 '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 '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 '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 'c3c6621a2cf2f0d40d062dcad1c9f65485473841' into eclair-plus-aosp
* commit 'c3c6621a2cf2f0d40d062dcad1c9f65485473841':
Setting the default HTTP user agent at runtime init.
Merge commit 'df5862173c03f0d9595a2a5cb56c4af407d893dd' into eclair-plus-aosp
* commit 'df5862173c03f0d9595a2a5cb56c4af407d893dd':
fix bug 2100169: add the line1 number + "/TYPE=PLMN" when sending a pdu.
Merge commit '4271c7c36bc6c3acef1a7d0926a5cf300e5efa4a' into eclair-plus-aosp
* commit '4271c7c36bc6c3acef1a7d0926a5cf300e5efa4a':
Keep track of 'initial' sync state in SyncStatusInfo
Merge commit '63147705bc2893d6ad43270e04beb9ee01e2ad53' into eclair-plus-aosp
* commit '63147705bc2893d6ad43270e04beb9ee01e2ad53':
Don't show the badge background when we have no uri, email, or phone.
Merge commit '36dac6ae8e005f0247e44345727d1580b1623127' into eclair-plus-aosp
* commit '36dac6ae8e005f0247e44345727d1580b1623127':
Bring the dimples back, and make the "spin around" animation have a fling feeling.
Merge commit '9bfb707597898f54722460b48588007b682f3e2a' into eclair-plus-aosp
* commit '9bfb707597898f54722460b48588007b682f3e2a':
Various fixes and improvements to window, activity.
Merge commit 'c0b8a96d28c55cb51e4f9e1f85c8d3ecf1ff13bf' into eclair-plus-aosp
* commit 'c0b8a96d28c55cb51e4f9e1f85c8d3ecf1ff13bf':
launching plugin activity when a plugin requests to go full screen.
- New meta-data you can add to a dock activity to have it launched by the
home key when the device is in that dock.
- Fix a deadlock involving ActivityThread's internal content provider lock.
- New window flag to have a non-secure keyguard entirely dismissed when a
window is displayed.
- New WindowManagerPolicy APIs to allow the policy to tell the system when
a change it makes during layout may cause the wall paper or
overall configuration to change.
- Fix a bug where an application token removed while one of its windows is
animating could cause the animating window to get stuck on screen.
Change-Id: I6d33fd39edd796bb9bdfd9dd7e077b84ca62ea08
Merge commit '34ca22d25303633c855a738409ea2f8e3f79a713' into eclair-plus-aosp
* commit '34ca22d25303633c855a738409ea2f8e3f79a713':
Set the bonding for incoming connections only when authentication is requested.
Merge commit '916b2ca9375b0a6a54e2bef2b2b5faab23ac3cfb' into eclair-plus-aosp
* commit '916b2ca9375b0a6a54e2bef2b2b5faab23ac3cfb':
Use FLAG_ACTIVITY_CLEAR_TOP when launching search suggestions.
Merge commit 'dee76be487fcdc975877f85221a693b87b9669a7' into eclair-plus-aosp
* commit 'dee76be487fcdc975877f85221a693b87b9669a7':
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 '24a3ff958b87550904a71961835f6883d1411c27' into eclair-plus-aosp
* commit '24a3ff958b87550904a71961835f6883d1411c27':
Change double tap toast to long toast.
Merge commit 'a57f82975eeb0a7dfa7d0fd310ae9612857a6c31'
* commit 'a57f82975eeb0a7dfa7d0fd310ae9612857a6c31':
Reimplement the settings to use async callbacks
Merge commit '194099dc4f614130f3baff14850792e6dc3fa59b' into eclair-plus-aosp
* commit '194099dc4f614130f3baff14850792e6dc3fa59b':
Reimplement the settings to use async callbacks
Merge commit 'a1d6c7d001cc4d2e53353be07127420c8907b6a3'
* commit 'a1d6c7d001cc4d2e53353be07127420c8907b6a3':
Fix bug with ScrollView so that text entry fields are not hidden by virtual keyboard.
