From 0fb1e4b5a77cf169629b2d89cdeda54ea3995b24 Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Thu, 24 May 2018 12:16:38 -0700 Subject: Cancelling quickscrub state incease we missed quickscrub end event > This can happen when the remote transition is cancelled while animating down during quickscrub, cause WindowTransformSwipeHandler to get invalidated and miss onQuickscrubEnd Bug: 80140388 Change-Id: I0221e301d4d633bab0defaa6af76e0054776a95a --- quickstep/src/com/android/quickstep/QuickScrubController.java | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'quickstep/src/com/android/quickstep/QuickScrubController.java') diff --git a/quickstep/src/com/android/quickstep/QuickScrubController.java b/quickstep/src/com/android/quickstep/QuickScrubController.java index 8e1a3d5d8..95a82dd86 100644 --- a/quickstep/src/com/android/quickstep/QuickScrubController.java +++ b/quickstep/src/com/android/quickstep/QuickScrubController.java @@ -132,6 +132,17 @@ public class QuickScrubController implements OnAlarmListener { } } + public void cancelActiveQuickscrub() { + if (!mInQuickScrub) { + return; + } + Log.d(TAG, "Quickscrub was active, cancelling"); + mInQuickScrub = false; + mActivityControlHelper = null; + mOnFinishedTransitionToQuickScrubRunnable = null; + mRecentsView.setNextPageSwitchRunnable(null); + } + /** * Initializes the UI for quick scrub, returns true if success. */ -- cgit v1.2.3 From 35cde20a171a774f048b6c25013d1389c734c0c8 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Thu, 24 May 2018 16:45:26 -0700 Subject: Tweaking quickscrub launch animation for new task sizes. Bug: 79945202 Change-Id: Ibe1e53d45bc3fda325cebc14aa6a61f61f08edb0 --- quickstep/src/com/android/quickstep/QuickScrubController.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'quickstep/src/com/android/quickstep/QuickScrubController.java') diff --git a/quickstep/src/com/android/quickstep/QuickScrubController.java b/quickstep/src/com/android/quickstep/QuickScrubController.java index 8e1a3d5d8..3cd6b0175 100644 --- a/quickstep/src/com/android/quickstep/QuickScrubController.java +++ b/quickstep/src/com/android/quickstep/QuickScrubController.java @@ -40,7 +40,7 @@ import com.android.quickstep.views.TaskView; public class QuickScrubController implements OnAlarmListener { public static final int QUICK_SCRUB_FROM_APP_START_DURATION = 240; - public static final int QUICK_SCRUB_FROM_HOME_START_DURATION = 150; + public static final int QUICK_SCRUB_FROM_HOME_START_DURATION = 200; // We want the translation y to finish faster than the rest of the animation. public static final float QUICK_SCRUB_TRANSLATION_Y_FACTOR = 5f / 6; public static final Interpolator QUICK_SCRUB_START_INTERPOLATOR = FAST_OUT_SLOW_IN; @@ -145,6 +145,10 @@ public class QuickScrubController implements OnAlarmListener { return true; } + public boolean isWaitingForTaskLaunch() { + return mWaitingForTaskLaunch; + } + /** * Attempts to go to normal overview or back to home, so UI doesn't prevent user interaction. */ -- cgit v1.2.3