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

* commit '11f9647e03d4e1141bc4312626c8dc9116f1f470': Hint text is visible when using center gravity.
2011-01-31 15:32:40 -08:00
parent 8a92eeb8d8 11f9647e03
commit e19246a38b
1 changed files with 3 additions and 4 deletions
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -5779,11 +5779,10 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener

        int want = width - getCompoundPaddingLeft() - getCompoundPaddingRight();
        int unpaddedWidth = want;
+
+        if (mHorizontallyScrolling) want = VERY_WIDE;
+
        int hintWant = want;
-
-        if (mHorizontallyScrolling)
-            want = VERY_WIDE;
-
        int hintWidth = mHintLayout == null ? hintWant : mHintLayout.getWidth();

        if (mLayout == null) {