commit 69632a46ab975e5410a098425c54d7d39cdc5d16
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Apr 19 18:02:12 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 19 18:02:12 2018 +0000
tree 260d14ffe4f32a9bdd2e7f9ddd4c0a6468b09020
parent e590e0b47722af7008c413d911b5f1ab7bdf892b
parent cc35bb88daf36fb73882dc25f7e56f62c353e410

Merge "Linking swipe animate to stateTransition to that it gets properly reset afterwards" into ub-launcher3-edmonton

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