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

Bug: 77848165 Change-Id: Ie4ae2fe933b37b66568c0a8eb29c85b9869a9987
2018-04-17 11:56:34 -07:00
parent de967a2355
commit cc35bb88da
1 changed files with 1 additions and 2 deletions
@@ -213,9 +213,8 @@ public interface ActivityControlHelper<T extends BaseDraggingActivity> {
                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);
        }