commit cc35bb88daf36fb73882dc25f7e56f62c353e410
author Sunny Goyal <sunnygoyal@google.com> Tue Apr 17 11:56:34 2018 -0700
committer Sunny Goyal <sunnygoyal@google.com> Tue Apr 17 20:03:57 2018 +0000
tree 4d434ddf1f8f0d8e8719fb633cb71f96540d6a86
parent de967a2355752c2653ed14a1d57a7a8c8c2eef57

Linking swipe animate to stateTransition to that it gets properly reset afterwards

Bug: 77848165
Change-Id: Ie4ae2fe933b37b66568c0a8eb29c85b9869a9987

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);
         }