commit fbe0e8f4183f3a42fde9aeeed024bee2fbf182b6
author Raph Levien <raph@google.com> Fri Nov 14 20:56:40 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Nov 14 20:56:40 2014 +0000
tree c1c3343ff5476495303efdbaf0d431ce8784ba8b
parent be1ad50b34e160c5d490d1165a590eb4c633d996
parent 25f7c4b99284cd1e118f50bd585e6534acfad7c4

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

* commit '25f7c4b99284cd1e118f50bd585e6534acfad7c4':
  Update hint text color even when text present

core/java/android/widget/TextView.java

diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 4ad75a6..bc8b535 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -3634,9 +3634,11 @@
         }
         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) {