diff options
| author | 2011-01-31 15:46:56 -0800 | |
|---|---|---|
| committer | 2011-01-31 15:46:56 -0800 | |
| commit | 7ad1a8e6c23aa4db06b9b39402c6d9b7b21de7cd (patch) | |
| tree | 91b75fac72b77055c151df6f9a2f4de8f4253bb7 | |
| parent | f5bf36c443282d1aa275e1384882a21134323f8a (diff) | |
| parent | e19246a38b76645bde43858945e78fcd2370b394 (diff) | |
am e19246a3: am 11f9647e: Merge "Hint text is visible when using center gravity." into honeycomb
* commit 'e19246a38b76645bde43858945e78fcd2370b394':
Hint text is visible when using center gravity.
| -rw-r--r-- | core/java/android/widget/TextView.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index e7c33ab745f3..df933cb50493 100644 --- 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; - int hintWant = want; - if (mHorizontallyScrolling) - want = VERY_WIDE; + if (mHorizontallyScrolling) want = VERY_WIDE; + int hintWant = want; int hintWidth = mHintLayout == null ? hintWant : mHintLayout.getWidth(); if (mLayout == null) { |