commit 25e7d67e11c1cff9911f43705b5f0ca306b89402
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Tue Apr 17 20:03:59 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Tue Apr 17 20:03:59 2018 +0000
tree 4d434ddf1f8f0d8e8719fb633cb71f96540d6a86
parent cc77030139639d55b0785679171d9c9bf098637e
parent cc35bb88daf36fb73882dc25f7e56f62c353e410

[automerger] Linking swipe animate to stateTransition to that it gets properly reset afterwards am: cc35bb88da

Change-Id: Ib102a0b6944a4d28be599e721f80c1b8c5e3bca9

quickstep/src/com/android/quickstep/ActivityControlHelper.java

diff --git a/quickstep/src/com/android/quickstep/ActivityControlHelper.java b/quickstep/src/com/android/quickstep/ActivityControlHelper.java
index 0ea729f..52db001 100644
--- a/quickstep/src/com/android/quickstep/ActivityControlHelper.java
+++ b/quickstep/src/com/android/quickstep/ActivityControlHelper.java
@@ -213,9 +213,8 @@
                 anim.play(shiftAnim);
             }
 
-            // TODO: Link this animation to state animation, so that it is cancelled
-            // automatically on state change
             anim.setDuration(transitionLength * 2);
+            activity.getStateManager().setCurrentAnimation(anim);
             return AnimatorPlaybackController.wrap(anim, transitionLength * 2);
         }