summaryrefslogtreecommitdiffstats
path: root/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
diff options
context:
space:
mode:
authorTony Wickham <twickham@google.com>2018-05-02 16:21:21 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-05-02 16:21:21 +0000
commitf325b19de384da8666af558f65933e0243508349 (patch)
treef64bea04a8b3b3aec2015350f27e669265b4d9ac /quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
parent7a5d4ae64fe43c12018174f9b5983f08a06b41e8 (diff)
parentf47e5ce3cf7e3eb4d481aea765784a8c6c19f47e (diff)
downloadandroid_packages_apps_Trebuchet-f325b19de384da8666af558f65933e0243508349.tar.gz
android_packages_apps_Trebuchet-f325b19de384da8666af558f65933e0243508349.tar.bz2
android_packages_apps_Trebuchet-f325b19de384da8666af558f65933e0243508349.zip
Merge "Gracefully handle some edge cases in quick scrub" into ub-launcher3-edmonton
Diffstat (limited to 'quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java')
-rw-r--r--quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java b/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
index ec50e6778..027f2e9df 100644
--- a/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
+++ b/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
@@ -64,7 +64,6 @@ import com.android.quickstep.ActivityControlHelper.AnimationFactory;
import com.android.quickstep.ActivityControlHelper.LayoutListener;
import com.android.quickstep.TouchConsumer.InteractionType;
import com.android.quickstep.util.ClipAnimationHelper;
-import com.android.quickstep.util.RemoteAnimationProvider;
import com.android.quickstep.util.RemoteAnimationTargetSet;
import com.android.quickstep.util.SysuiEventLogger;
import com.android.quickstep.views.RecentsView;
@@ -767,7 +766,7 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> {
}
mActivityControlHelper.onQuickInteractionStart(mActivity, false);
- mQuickScrubController.onQuickScrubStart(false);
+ mQuickScrubController.onQuickScrubStart(false, mActivityControlHelper);
// Inform the last progress in case we skipped before.
mQuickScrubController.onQuickScrubProgress(mCurrentQuickScrubProgress);