Merge commit '5d81e8c82aa8d55eff2c2c78e4a553c479332187'
* commit '5d81e8c82aa8d55eff2c2c78e4a553c479332187':
Workaround for 2262578: Don't draw tabs if view is not in the correct orientation for the layout
Merge commit '41029cf413abbfdf004e04f192a440e457701c47'
* commit '41029cf413abbfdf004e04f192a440e457701c47':
Fix for 2267410 : Battery use doesn't show CPU usage on non-wiped devices
Merge commit '30142f7ef7bf3d4699526cb9ce02b220a8045c5d' into eclair-mr2
* commit '30142f7ef7bf3d4699526cb9ce02b220a8045c5d':
Workaround for 2262578: Don't draw tabs if view is not in the correct orientation for the layout
Merge commit '778f1e65a5ea37bc4adc4725e281a34b775bc72d' into eclair-mr2
* commit '778f1e65a5ea37bc4adc4725e281a34b775bc72d':
Fix for 2267410 : Battery use doesn't show CPU usage on non-wiped devices
Due to a change in cpu stepping values, the batterystats.bin file needs to
be wiped for Battery Use app to show CPU cost correctly.
Bumping up the version number of the file fixes this.
This is an uber hack. Since there is a race between resizing the view and getting
the orientation-changed notification, this just tries to avoid drawing the tabs in the
wrong orientation (based on what we *expect* to be the orientation specified in the layout
file for the SlidingTab). This masks the problem *most* of the time.
Merge commit '8bf56e6a1bb842aaae2b8b7630d2bc2711f36bb6'
* commit '8bf56e6a1bb842aaae2b8b7630d2bc2711f36bb6':
Fix 2209086: Clean up visual glitches in SlidingTab for lock and incall screen.
Merge commit '6bcd99c2a63338254c68e27e40e5395cbdd3e1ef' into eclair-mr2
* commit '6bcd99c2a63338254c68e27e40e5395cbdd3e1ef':
Move photo querying off main thread.
Merge commit 'f0166e4dd0907e487531960e36f516406d265b73' into eclair-mr2
* commit 'f0166e4dd0907e487531960e36f516406d265b73':
Fix 2209086: Clean up visual glitches in SlidingTab for lock and incall screen.
This fixes the following glitches:
- flash at the end of animation as the widget resets. Fix: new "hold" animation holds the view for 1 second, allowing it to transition before we reset the view.
- target flashing. Fix: remove AlphaAnimation when we want to hide the target.
- bar appears to get stuck at edge. Fix: sliding bar now slides fully offscreen when hold == true. Added setHoldAfterTrigger() method to allow InCallScreen and LockScreen to have different behaviors.
- view continues to animate when shown again. Fix: reset the animations and sliders when the view is hidden.
Tested:
Answer/Decline call on CDMA and GSM device.
Unlock phone and toggle sound on/off in LockScreen on both devices.
Added translation animation where tab "flies" when you release.
Added translation animation where pressing and releasing one tab will hide/show the other
Added alpha animation to make target appear gradually
Added margin around swipe area to allow easier unlocking.
Removed unused handler.
Merge commit '16a9d9a736a1bfdc12aa54c549508dd12596247f' into eclair-mr2
* commit '16a9d9a736a1bfdc12aa54c549508dd12596247f':
Fix 2209086: Fix missing callback that was preventing tab bar text from updating.
Merge commit '17831dd428419686ec0e6da9b25fd593bdee7ac0'
* commit '17831dd428419686ec0e6da9b25fd593bdee7ac0':
Fix 2261626: Don't show text on button if orientation is vertical.
Merge commit '7c1c46000be136ffda36283fdc93bfe3cba72601' into eclair-mr2
* commit '7c1c46000be136ffda36283fdc93bfe3cba72601':
Fix 2261626: Don't show text on button if orientation is vertical.
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 '09904d84d10c5b3345c2594e9fe3ec275a4f3a69'
* commit '09904d84d10c5b3345c2594e9fe3ec275a4f3a69':
Update keyguard and pattern-lock layouts for new UX designs.
Merge commit '609bbf182e4b4f39b6be7ed01331887ca70ea4c1' into eclair-mr2
* 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 '809b2594886fa64f23bd6e87f97f8b06e933fa9e'
* commit '809b2594886fa64f23bd6e87f97f8b06e933fa9e':
Fix 2209086: add drawables for SlidingTab states in PhoneApp. Update string file for new SlidingTab sound states.
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.
Merge commit 'ad902f06dd44e30286c48c8a28bb2509b80c63bc'
* commit 'ad902f06dd44e30286c48c8a28bb2509b80c63bc':
Fix for 2209086: Initial pass at new SlidingTab widget and integration into LockScreen.
Merge commit '2f92bd3ecb45e2690dcdc9c09564a1b3805f673b' into eclair-mr2
* commit '2f92bd3ecb45e2690dcdc9c09564a1b3805f673b':
Fix for 2209086: Initial pass at new SlidingTab widget and integration into LockScreen.
Merge commit 'eac4222f7f30bf1df14b223cf62e594914dd32d4'
* commit 'eac4222f7f30bf1df14b223cf62e594914dd32d4':
Add a way for wallpapers to know the delta between virtual screens.
Merge commit '11cff8cd30f03b5adb137e985532543da5e960c4' into eclair-mr2
* commit '11cff8cd30f03b5adb137e985532543da5e960c4':
Add a way for wallpapers to know the delta between virtual screens.
Merge commit '473bbd2140a2515a6a9a450ee955a790e0b6dcff'
* commit '473bbd2140a2515a6a9a450ee955a790e0b6dcff':
Instead of a raw AIDL interface, give DropBox a Java
