diff options
| author | Gilles Debunne <debunne@google.com> | 2011-01-31 15:29:56 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-31 15:29:56 -0800 |
| commit | 11f9647e03d4e1141bc4312626c8dc9116f1f470 (patch) | |
| tree | 195f5a50a29b1daeac9122e503dbcc4f9dabb828 /core/java | |
| parent | 03245a8ec46acc7c2b24d3d680ea5b88bd89ce13 (diff) | |
| parent | 9a80a650467384d582d3cdf13a8136622a831885 (diff) | |
| download | frameworks_base-11f9647e03d4e1141bc4312626c8dc9116f1f470.zip frameworks_base-11f9647e03d4e1141bc4312626c8dc9116f1f470.tar.gz frameworks_base-11f9647e03d4e1141bc4312626c8dc9116f1f470.tar.bz2 | |
Merge "Hint text is visible when using center gravity." into honeycomb
Diffstat (limited to 'core/java')
| -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 e7c33ab..df933cb 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) { |