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

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

am 7c1c4600: Merge change I425ca595 into eclair 

Merge commit '7c1c4600' into eclair-mr2

* commit '7c1c4600':
  Fix 2261626: Don't show text on button if orientation is vertical.
parents cc96ede2 7c1c4600

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

+23 −20
Original line number Diff line number Diff line
@@ -201,7 +201,6 @@ public class SlidingTab extends ViewGroup { 
        }



        void setHintText(int resId) {

            // TODO: Text should be blank if widget is vertical

            text.setText(resId);

        }
@@ -564,8 +563,10 @@ public class SlidingTab extends ViewGroup { 
     * @param resId

     */

    public void setLeftHintText(int resId) {

        if (isHorizontal()) {

            mLeftSlider.setHintText(resId);

        }

    }



    /**

     * Sets the right handle icon to a given resource.
@@ -592,8 +593,10 @@ public class SlidingTab extends ViewGroup { 
     * @param resId

     */

    public void setRightHintText(int resId) {

        if (isHorizontal()) {

            mRightSlider.setHintText(resId);

        }

    }



    /**

     * Triggers haptic feedback.