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

Commit 7ad1a8e6 authored by Gilles Debunne's avatar Gilles Debunne Committed by Android Git Automerger
Browse files

am e19246a3: am 11f9647e: Merge "Hint text is visible when using center gravity." into honeycomb 

* commit 'e19246a3':
  Hint text is visible when using center gravity.
parents f5bf36c4 e19246a3

core/java/android/widget/TextView.java

+2 −3
Original line number Original line Diff line number Diff line
@@ -5779,11 +5779,10 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 




        int want = width - getCompoundPaddingLeft() - getCompoundPaddingRight();

        int want = width - getCompoundPaddingLeft() - getCompoundPaddingRight();

        int unpaddedWidth = want;

        int unpaddedWidth = want;

        int hintWant = want;





        if (mHorizontallyScrolling)

        if (mHorizontallyScrolling) want = VERY_WIDE;

            want = VERY_WIDE;





        int hintWant = want;

        int hintWidth = mHintLayout == null ? hintWant : mHintLayout.getWidth();

        int hintWidth = mHintLayout == null ? hintWant : mHintLayout.getWidth();





        if (mLayout == null) {

        if (mLayout == null) {