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

Commit e3f07562 authored by Michael Jurka's avatar Michael Jurka Committed by Android (Google) Code Review
Browse files

Merge "Removing TextView predraw listeners sooner"

parents 4cf3bd29 2b942d53

core/java/android/widget/TextView.java

+6 −6
Original line number Diff line number Diff line
@@ -4210,6 +4210,12 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 


    @Override

    protected void onDraw(Canvas canvas) {

        if (mPreDrawState == PREDRAW_DONE) {

            final ViewTreeObserver observer = getViewTreeObserver();

            observer.removeOnPreDrawListener(this);

            mPreDrawState = PREDRAW_NOT_REGISTERED;

        }



        if (mCurrentAlpha <= ViewConfiguration.ALPHA_THRESHOLD_INT) return;



        restartMarqueeIfNeeded();
@@ -4281,12 +4287,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
            }

        }



        if (mPreDrawState == PREDRAW_DONE) {

            final ViewTreeObserver observer = getViewTreeObserver();

            observer.removeOnPreDrawListener(this);

            mPreDrawState = PREDRAW_NOT_REGISTERED;

        }



        int color = mCurTextColor;



        if (mLayout == null) {