Fixes crash when tap on nav bar without using quickstep

Fixes crash on nav bar by setting default pos/states of home button and
track opacity to avoid null error when tapping the nav bar before using
quick scrub. Also fixes the lack of animation of quick scrub when it
retracts.

Fixes: 73814434
Test: tap the nav bar upon reboot (or kill sysui process) before using
quickscrub

Change-Id: I2d35dcdf6e860ffb3959d48b4a4cdc319e939d1b

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickScrubController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickScrubController.java
index b82b0ee..00aff53 100644 (file)
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickScrubController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickScrubController.java
@@ -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();
     }