am 25f7c4b9: Merge "Update hint text color even when text present" into lmp-mr1-dev

automerge: fbe0e8f * commit 'fbe0e8f4183f3a42fde9aeeed024bee2fbf182b6': Update hint text color even when text present
2014-11-14 21:51:44 +00:00
parent 2d20850525 fbe0e8f418
commit c047ca4540
1 changed files with 4 additions and 2 deletions
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -3633,9 +3633,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) {