OSDN Git Service

Merge "Quick scrub has gradient follow user drag" into pi-dev am: 5f5c6e993f
authorMatthew Ng <ngmatthew@google.com>
Mon, 25 Jun 2018 21:03:00 +0000 (14:03 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Jun 2018 21:03:00 +0000 (14:03 -0700)
am: d60292d292

Change-Id: I57cf675a23fb4b0dae376859f4ceddb8f252405c

1  2 
packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStepController.java

@@@ -418,17 -420,9 +428,15 @@@ public class QuickStepController implem
      }
  
      private void startQuickScrub() {
 +        if (mIsInScreenPinning) {
 +            mNavigationBarView.showPinningEscapeToast();
 +            mAllowGestureDetection = false;
 +            return;
 +        }
 +
          if (!mQuickScrubActive) {
+             updateHighlight();
              mQuickScrubActive = true;
-             mLightTrackColor = mContext.getColor(R.color.quick_step_track_background_light);
-             mDarkTrackColor = mContext.getColor(R.color.quick_step_track_background_dark);
              ObjectAnimator trackAnimator = ObjectAnimator.ofPropertyValuesHolder(this,
                      PropertyValuesHolder.ofFloat(mTrackAlphaProperty, 1f),
                      PropertyValuesHolder.ofFloat(mTrackScaleProperty, 1f));