Merge commit 'b602c328c24f82d61038ac1222bd40a3cc7bc900' into eclair-mr2
* commit 'b602c328c24f82d61038ac1222bd40a3cc7bc900':
Revert change incorrectly submitted as part of change #32153.
Merge commit 'dffa96f7349a44a5d587656fce5c55386d44b150' into eclair-mr2
* commit 'dffa96f7349a44a5d587656fce5c55386d44b150':
fix [2143798] Need to figure out how to do video on Passion w/ GPU
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-mr2
* commit '609bbf182e4b4f39b6be7ed01331887ca70ea4c1':
Update keyguard and pattern-lock layouts for new UX designs.
Merge commit 'ea48cd6dd4e64bcb5c840a12fe052f704510e01c' into eclair-mr2
* commit 'ea48cd6dd4e64bcb5c840a12fe052f704510e01c':
Use a diff that ignores trailing whitespaces to get by some layout test failures.
-Only perform validation when the view is *losing* focus.
-Don't perform validation when the window focus changes. This causes odd
behavior like validation being peformed when menu is pressed, or long
press dialogs pop-up.
Merge commit 'ddf157cae48a17e72e740538a981a63394ec2274' into eclair-mr2
* commit 'ddf157cae48a17e72e740538a981a63394ec2274':
Don't back up system wallpapers.
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-mr2
* commit '3c58d279abed1da56b0ece74ded5854c509a42a4':
Fix BMW and Audi auto pairing lists.
Merge commit '2ba297d19e101ab3c6456aa7813a043d66c572b6' into eclair-mr2
* commit '2ba297d19e101ab3c6456aa7813a043d66c572b6':
Fix 2209086: Fix landscape layout of LockScreen on devices with a keyboard
Merge commit '013b0e531a4318b3e78c9bd0e077d3632fce2280' into eclair-mr2
* commit '013b0e531a4318b3e78c9bd0e077d3632fce2280':
Add BMW and Audi to Auto Pairing black list.
Merge commit 'dc30d28bc8321171fbf4ed92a9486eb8dd382259' into eclair-mr2
* commit 'dc30d28bc8321171fbf4ed92a9486eb8dd382259':
Honor the mInitialScale set on WebView. This was
Merge commit 'f2897fe42e22966127dbee8025d6bdc1d1697d81' into eclair-mr2
* commit 'f2897fe42e22966127dbee8025d6bdc1d1697d81':
Fix 2209086: add drawables for SlidingTab states in PhoneApp. Update string file for new SlidingTab sound states.
Also reworks this intent protocol a little bit to be much more efficient, only
requiring one broadcast per package.
Change-Id: I580de4843ebd3c7f2e6df7295a2f80d2937cef7c
* changes:
Fix 2209086: add drawables for SlidingTab states in PhoneApp. Update string file for new SlidingTab sound states. Tweak "animation" to be 250ms based on conversation with ui guys. Some minor performance tweaks to SlidingTab.
Merge commit '001e5242c8a801664ea454a2ed6d4fddb600157a' into eclair-mr2
* commit '001e5242c8a801664ea454a2ed6d4fddb600157a':
Fix broken handling of the BACK key in PopupWindow. Needed by Launcher2.
Merge commit 'ca20347543797a67b48a369f9b901cecabd231e3' into eclair-mr2
* commit 'ca20347543797a67b48a369f9b901cecabd231e3':
New Javadoc for ContactsContract.
Merge commit '2ade6421f2d6dd615b559c951deace7143958b90' into eclair-mr2
* commit '2ade6421f2d6dd615b559c951deace7143958b90':
Debugging for issue #2250075: Desk dock clock app sometimes doesn't
