summaryrefslogtreecommitdiffstats
path: root/quickstep
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2018-04-26 17:56:18 +0000
committerAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2018-04-26 17:56:18 +0000
commitb8f461b31b389229b02b8e775e2b489654391ff6 (patch)
tree10edcfcd57dbbf5bc36a5a9c3180975f313146fb /quickstep
parent1b179a5f84e2af6b84a374e2e5731c7b97adc880 (diff)
parent23f83a8b7b6676767a34e33cc334d6c80696f08e (diff)
downloadandroid_packages_apps_Trebuchet-b8f461b31b389229b02b8e775e2b489654391ff6.tar.gz
android_packages_apps_Trebuchet-b8f461b31b389229b02b8e775e2b489654391ff6.tar.bz2
android_packages_apps_Trebuchet-b8f461b31b389229b02b8e775e2b489654391ff6.zip
[automerger] Revert "Revert "Fixing recents transition not getting completed when using QuickScrub"" am: 23f83a8b7b
Change-Id: I1e6dde4e68ca1b5d9324361e401eda6c5b484258
Diffstat (limited to 'quickstep')
-rw-r--r--quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java b/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
index 881b09b1d..3217b78a8 100644
--- a/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
+++ b/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
@@ -442,7 +442,7 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> {
}
mInteractionType = interactionType;
- setStateOnUiThread(STATE_QUICK_SCRUB_START);
+ setStateOnUiThread(STATE_QUICK_SCRUB_START | STATE_GESTURE_COMPLETED);
// Start the window animation without waiting for launcher.
animateToProgress(1f, QUICK_SCRUB_START_DURATION, TOUCH_RESPONSE_INTERPOLATOR);