diff options
| author | Raph Levien <raph@google.com> | 2014-11-14 20:53:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-14 20:53:14 +0000 |
| commit | 25f7c4b99284cd1e118f50bd585e6534acfad7c4 (patch) | |
| tree | b742b60e7b77a399b6c5e9aa0a7c9ef6fbdd50fc /core/java/android/widget/TextView.java | |
| parent | cda81f2ded39b53dd813071760ad235363292d52 (diff) | |
| parent | c1bf285966f95a52cfa7843efb2b8e37b5b752c9 (diff) | |
Merge "Update hint text color even when text present" into lmp-mr1-dev
Diffstat (limited to 'core/java/android/widget/TextView.java')
| -rw-r--r-- | core/java/android/widget/TextView.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 4ad75a636501..bc8b53553cb9 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -3634,9 +3634,11 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener } if (mHintTextColor != null) { color = mHintTextColor.getColorForState(getDrawableState(), 0); - if (color != mCurHintTextColor && mText.length() == 0) { + if (color != mCurHintTextColor) { mCurHintTextColor = color; - inval = true; + if (mText.length() == 0) { + inval = true; + } } } if (inval) { |