diff options
| author | Jim Miller <jaggies@google.com> | 2009-11-15 14:51:12 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-15 14:51:12 -0800 |
| commit | ac4bacd9777c12e4cd6ddc335518a61a3f18f47f (patch) | |
| tree | bdf080f9726c8e97387f08bff11b3c0dd4aa17d9 /core | |
| parent | 197ef85ef5c8563270a38808d2716a29e12e00e9 (diff) | |
| parent | 16a9d9a736a1bfdc12aa54c549508dd12596247f (diff) | |
| download | frameworks_base-ac4bacd9777c12e4cd6ddc335518a61a3f18f47f.zip frameworks_base-ac4bacd9777c12e4cd6ddc335518a61a3f18f47f.tar.gz frameworks_base-ac4bacd9777c12e4cd6ddc335518a61a3f18f47f.tar.bz2 | |
am 16a9d9a7: Fix 2209086: Fix missing callback that was preventing tab bar text from updating.
Merge commit '16a9d9a736a1bfdc12aa54c549508dd12596247f' into eclair-mr2
* commit '16a9d9a736a1bfdc12aa54c549508dd12596247f':
Fix 2209086: Fix missing callback that was preventing tab bar text from updating.
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/com/android/internal/widget/SlidingTab.java | 1 | ||||
| -rw-r--r-- | core/res/res/layout/keyguard_screen_tab_unlock.xml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/core/java/com/android/internal/widget/SlidingTab.java b/core/java/com/android/internal/widget/SlidingTab.java index 7855493..2dee5e5 100644 --- a/core/java/com/android/internal/widget/SlidingTab.java +++ b/core/java/com/android/internal/widget/SlidingTab.java @@ -471,6 +471,7 @@ public class SlidingTab extends ViewGroup { mCurrentSlider.setState(Slider.STATE_ACTIVE); dispatchTriggerEvent(mCurrentSlider == mLeftSlider ? OnTriggerListener.LEFT_HANDLE : OnTriggerListener.RIGHT_HANDLE); + setGrabbedState(OnTriggerListener.NO_HANDLE); // TODO: This is a place holder for the real animation. It just holds // the screen for the duration of the animation for now. diff --git a/core/res/res/layout/keyguard_screen_tab_unlock.xml b/core/res/res/layout/keyguard_screen_tab_unlock.xml index 1991e98..fdb9ad5 100644 --- a/core/res/res/layout/keyguard_screen_tab_unlock.xml +++ b/core/res/res/layout/keyguard_screen_tab_unlock.xml @@ -50,7 +50,7 @@ android:layout_height="wrap_content" android:layout_below="@id/carrier" android:layout_marginBottom="8dip" - android:layout_marginTop="16dip" + android:layout_marginTop="60dip" android:layout_marginLeft="24dip" > |