Merge "Update hint text color even when text present" into lmp-mr1-dev (25f7c4b9) · Commits · e / os / android_frameworks_base

core/java/android/widget/TextView.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -3634,11 +3634,13 @@ 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;
		if (mText.length() == 0) {
		inval = true;
		}
		}
		}
		if (inval) {
		// Text needs to be redrawn with the new color
		if (mEditor != null) mEditor.invalidateTextDisplayList();