Merge commit '73f8aa678055598738dfba54c60a1674bcbf02b1' into eclair-plus-aosp
* commit '73f8aa678055598738dfba54c60a1674bcbf02b1':
Removed the fixed height in the sim unlock screen's header.
Merge commit '9284dec737da58a92b3aa916a357e700d291a68a' into eclair-plus-aosp
* commit '9284dec737da58a92b3aa916a357e700d291a68a':
Update VCardComposer getOwnerPhoneNumberVcard() to support empty vcard for 0.vcf
Merge commit '27d6e65b71f515deafbd93d5aa98732898c34ddf' into eclair-plus-aosp
* commit '27d6e65b71f515deafbd93d5aa98732898c34ddf':
Add support for making a LiveWallpaper the default
Merge commit 'd05fd6c33518e60664ffdf1bb6cb425f36c2b82f' into eclair-plus-aosp
* commit 'd05fd6c33518e60664ffdf1bb6cb425f36c2b82f':
docs: document the 'showSearchIconAsBadge" flag and
Add check in getOwnerPhoneNumberVcard(). If the incoming phonenumber is empty,
do not add "TEL" to vcard data.
Original Change by: Yue Lixin
DrNo: Eastham
Bug: 2247067
Merge commit 'dbc7e27ef10349f11ac940d59ff4f812319fce51' into eclair
* commit 'dbc7e27ef10349f11ac940d59ff4f812319fce51':
docs: document the 'showSearchIconAsBadge" flag and
Merge commit 'b4c20fca102a2ec6acf1648f2fd16d54fdc07f56' into eclair-plus-aosp
* commit 'b4c20fca102a2ec6acf1648f2fd16d54fdc07f56':
Import revised translations. DO NOT MERGE
Merge commit '2a1e96412c66f22939c010f10524122718c7bbeb' into eclair-plus-aosp
* commit '2a1e96412c66f22939c010f10524122718c7bbeb':
Add code to use Gservices provided values for throtting NITZ updates.
The headset state indicated by HeadsetObserver in the broadcast intent ACTION_HEADSET_PLUG was not 0 or 1 as specified in the java doc but contained a bit field indicating the type of headset connected.
Modified HeadsetObserver to broacast a state conforming to java doc.
Added an extra to intent ACTION_HEADSET_PLUG to indicate if headset has a microphone or not.
Removed handling of non standard headset indications from HeadsetObserver.
Removed platform specific devices from output devices defined in AudioSystem.
Modified AudioService to use new ACTION_HEADSET_PLUG intent extra instead of bitfield in state.
This fixes a bug where the right tab hightlight wasn't being seen.
The prooblem was that we weren't preserving the drawables' states when
the application requested a new drawable. We now track the drawable state
so we can updated it when the resources change.
Merge commit '609bbf182e4b4f39b6be7ed01331887ca70ea4c1' into eclair-plus-aosp
* commit '609bbf182e4b4f39b6be7ed01331887ca70ea4c1':
Update keyguard and pattern-lock layouts for new UX designs.
To do this, we bring DigitalClock over from Clock into the
internal widgets. Its font, Clockopia, comes along for the
ride (find it in /system/fonts).
This change is required for relevant code changes in
frameworks/policy/phone.
Change-Id: I354534f1abd9cf9557c9d18566f1d55b6be5e8f1
Merge commit '3c58d279abed1da56b0ece74ded5854c509a42a4' into eclair-plus-aosp
* commit '3c58d279abed1da56b0ece74ded5854c509a42a4':
Fix BMW and Audi auto pairing lists.
Merge commit '2ba297d19e101ab3c6456aa7813a043d66c572b6' into eclair-plus-aosp
* commit '2ba297d19e101ab3c6456aa7813a043d66c572b6':
Fix 2209086: Fix landscape layout of LockScreen on devices with a keyboard
Merge commit '013b0e531a4318b3e78c9bd0e077d3632fce2280' into eclair-plus-aosp
* commit '013b0e531a4318b3e78c9bd0e077d3632fce2280':
Add BMW and Audi to Auto Pairing black list.
Merge commit 'dc30d28bc8321171fbf4ed92a9486eb8dd382259' into eclair-plus-aosp
* commit 'dc30d28bc8321171fbf4ed92a9486eb8dd382259':
Honor the mInitialScale set on WebView. This was
Also reworks this intent protocol a little bit to be much more efficient, only
requiring one broadcast per package.
Change-Id: I580de4843ebd3c7f2e6df7295a2f80d2937cef7c
Merge commit 'f2897fe42e22966127dbee8025d6bdc1d1697d81' into eclair-plus-aosp
* commit 'f2897fe42e22966127dbee8025d6bdc1d1697d81':
Fix 2209086: add drawables for SlidingTab states in PhoneApp. Update string file for new SlidingTab sound states.
