Merge changes from topic "am-3e098e52-a5e6-4050-ac05-724b2c56ff1d" into ub-launcher3-master
* changes:
[automerger] Linking swipe animate to stateTransition to that it gets properly reset afterwards am: cc35bb88da
Linking swipe animate to stateTransition to that it gets properly reset afterwards
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);
}