Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
automerge: fbe0e8f

* commit 'fbe0e8f4183f3a42fde9aeeed024bee2fbf182b6':
  Update hint text color even when text present
This commit is contained in:
Raph Levien
2014-11-14 21:51:44 +00:00
committed by android-build-merger
parent 2d20850525 fbe0e8f418
commit c047ca4540
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/widget/TextView.java
View File

@@ -3633,9 +3633,11 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
} }
if (mHintTextColor != null) { if (mHintTextColor != null) {
color = mHintTextColor.getColorForState(getDrawableState(), 0); color = mHintTextColor.getColorForState(getDrawableState(), 0);
if (color != mCurHintTextColor && mText.length() == 0) { if (color != mCurHintTextColor) {
mCurHintTextColor = color; mCurHintTextColor = color;
inval = true; if (mText.length() == 0) {
inval = true;
}
} }
} }
if (inval) { if (inval) {