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

Commit 1184694c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fixes crash when tap on nav bar without using quickstep"

parents 30bfbfa3 55437a93

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

+3 −0
Original line number Diff line number Diff line
@@ -176,8 +176,10 @@ public class QuickScrubController extends GestureDetector.SimpleOnGestureListene 


        mTrackAnimator = ObjectAnimator.ofFloat();

        mTrackAnimator.addUpdateListener(mTrackAnimatorListener);

        mTrackAnimator.setFloatValues(0);

        mButtonAnimator = ObjectAnimator.ofInt();

        mButtonAnimator.addUpdateListener(mButtonTranslationListener);

        mButtonAnimator.setIntValues(0);

        mQuickScrubEndAnimator = new AnimatorSet();

        mQuickScrubEndAnimator.playTogether(mTrackAnimator, mButtonAnimator);

        mQuickScrubEndAnimator.setDuration(ANIM_DURATION_MS);
@@ -434,6 +436,7 @@ public class QuickScrubController extends GestureDetector.SimpleOnGestureListene 
    private void animateEnd() {

        mButtonAnimator.setIntValues((int) mTranslation, 0);

        mTrackAnimator.setFloatValues(mTrackAlpha, 0);

        mQuickScrubEndAnimator.setCurrentPlayTime(0);

        mQuickScrubEndAnimator.start();

    }