summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2018-04-26 15:19:47 +0000
committerAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2018-04-26 15:19:47 +0000
commit1749534be162cb7b502362d14012c6be63f3f6ad (patch)
tree9ccaa40673865af798b4960e9250e7cefe9913ab
parent4bbb152c4a1ba721ffb1ae111d93855080f199eb (diff)
parent22c72167ae8db28cf1dca72a0c199b59d8246291 (diff)
downloadandroid_packages_apps_Trebuchet-1749534be162cb7b502362d14012c6be63f3f6ad.tar.gz
android_packages_apps_Trebuchet-1749534be162cb7b502362d14012c6be63f3f6ad.tar.bz2
android_packages_apps_Trebuchet-1749534be162cb7b502362d14012c6be63f3f6ad.zip
[automerger] Fixing recents transition not getting completed when using QuickScrub am: 22c72167ae
Change-Id: I46d4633274c4696c42988b1a7ab1cf65576e4a82
-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);