diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2018-06-03 07:26:36 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-06-03 07:26:36 +0000 |
commit | 73859d052104d841fdb8560e49d8a46c5bff93b1 (patch) | |
tree | 58cf13d9da0fde15896d03148bfece106ad78f61 /quickstep/src/com/android/quickstep/QuickScrubController.java | |
parent | df0843e569b93e77355990f7a71fe39746b43493 (diff) | |
parent | bf29023212a107481b6cbf3dbe4fda52c6f50180 (diff) | |
download | android_packages_apps_Trebuchet-73859d052104d841fdb8560e49d8a46c5bff93b1.tar.gz android_packages_apps_Trebuchet-73859d052104d841fdb8560e49d8a46c5bff93b1.tar.bz2 android_packages_apps_Trebuchet-73859d052104d841fdb8560e49d8a46c5bff93b1.zip |
Snap for 4818534 from bf29023212a107481b6cbf3dbe4fda52c6f50180 to pi-releaselineage-16.0_20181101
Change-Id: I06c92e93af46c5f35d997815ed1392cca2f05c46
Diffstat (limited to 'quickstep/src/com/android/quickstep/QuickScrubController.java')
-rw-r--r-- | quickstep/src/com/android/quickstep/QuickScrubController.java | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/quickstep/src/com/android/quickstep/QuickScrubController.java b/quickstep/src/com/android/quickstep/QuickScrubController.java index 8e1a3d5d8..7a79c6f4d 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; @@ -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. */ @@ -145,6 +156,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. */ |