commit 8625d0d8e78876747fb59c2930ee95ee58c9bd75
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Oct 17 23:51:11 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 17 23:51:11 2019 +0000
tree cfe929125c1df4b264f402f248f6e7bb86a8e182
parent 5a6eb2d5df8ce976db00f67f246317b87c84dd8a
parent dfd8b5e07d05f394f4ba74e69864e2817de342cd

Merge "Fix regression from ag/9518396" into ub-launcher3-master

quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java
index 22ad180..f1b3598 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java
@@ -1009,7 +1009,10 @@
 
     @Override
     public void onConsumerAboutToBeSwitched() {
-        if (!mGestureState.isRunningAnimationToLauncher()) {
+        if (mActivity != null) {
+            mActivity.setOnStartCallback(null);
+        }
+        if (mGestureState.getEndTarget() != null && !mGestureState.isRunningAnimationToLauncher()) {
             cancelCurrentAnimation();
         } else {
             reset();