Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c047ca45 authored by Raph Levien's avatar Raph Levien Committed by android-build-merger
Browse files

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

automerge: fbe0e8f4

* commit 'fbe0e8f4':
  Update hint text color even when text present
parents 2d208505 fbe0e8f4

core/java/android/widget/TextView.java

+4 −2
Original line number Diff line number Diff line
@@ -3633,11 +3633,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();