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

Commit a28acdbc authored by Matthew Ng's avatar Matthew Ng Committed by android-build-merger
Browse files

Merge "Fix back button not disappearing" into qt-dev am: e1bdc4b0 

am: 1f5e5d57

Change-Id: I9aeb349881d65dfda95127f4dca58dc80fe91d91
parents 1999b0e5 1f5e5d57

packages/SystemUI/src/com/android/systemui/statusbar/phone/ButtonDispatcher.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -61,6 +61,7 @@ public class ButtonDispatcher { 
    private final AnimatorListenerAdapter mFadeListener = new AnimatorListenerAdapter() {

    private final AnimatorListenerAdapter mFadeListener = new AnimatorListenerAdapter() {

        @Override

        @Override

        public void onAnimationEnd(Animator animation) {

        public void onAnimationEnd(Animator animation) {

            mFadeAnimator = null;

            setVisibility(getAlpha() == 1 ? View.VISIBLE : View.INVISIBLE);

            setVisibility(getAlpha() == 1 ? View.VISIBLE : View.INVISIBLE);

        }

        }

    };

    };
@@ -143,7 +144,6 @@ public class ButtonDispatcher { 
        if (mVisibility == visibility) return;

        if (mVisibility == visibility) return;

        if (mFadeAnimator != null) {

        if (mFadeAnimator != null) {

            mFadeAnimator.cancel();

            mFadeAnimator.cancel();

            mFadeAnimator = null;

        }

        }





        mVisibility = visibility;

        mVisibility = visibility;
@@ -176,13 +176,13 @@ public class ButtonDispatcher { 
            if (mFadeAnimator != null) {

            if (mFadeAnimator != null) {

                mFadeAnimator.cancel();

                mFadeAnimator.cancel();

            }

            }

            setVisibility(View.VISIBLE);

            mFadeAnimator = ValueAnimator.ofFloat(getAlpha(), alpha);

            mFadeAnimator = ValueAnimator.ofFloat(getAlpha(), alpha);

            mFadeAnimator.setDuration(duration);

            mFadeAnimator.setDuration(duration);

            mFadeAnimator.setInterpolator(getAlpha() < alpha ? ALPHA_IN : ALPHA_OUT);

            mFadeAnimator.setInterpolator(getAlpha() < alpha ? ALPHA_IN : ALPHA_OUT);

            mFadeAnimator.addListener(mFadeListener);

            mFadeAnimator.addListener(mFadeListener);

            mFadeAnimator.addUpdateListener(mAlphaListener);

            mFadeAnimator.addUpdateListener(mAlphaListener);

            mFadeAnimator.start();

            mFadeAnimator.start();

            setVisibility(View.VISIBLE);

        } else {

        } else {

            mAlpha = alpha;

            mAlpha = alpha;

            final int N = mViews.size();

            final int N = mViews.size();