Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac4bacd9 authored by Jim Miller's avatar Jim Miller Committed by Android Git Automerger
Browse files

am 16a9d9a7: Fix 2209086: Fix missing callback that was preventing tab bar text from updating. 

Merge commit '16a9d9a7' into eclair-mr2

* commit '16a9d9a7':
  Fix 2209086: Fix missing callback that was preventing tab bar text from updating.
parents 197ef85e 16a9d9a7

core/java/com/android/internal/widget/SlidingTab.java

+1 −0
Original line number Diff line number Diff line
@@ -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.

core/res/res/layout/keyguard_screen_tab_unlock.xml

+1 −1
Original line number Diff line number Diff line
@@ -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"

            >