From cc35bb88daf36fb73882dc25f7e56f62c353e410 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Tue, 17 Apr 2018 11:56:34 -0700
Subject: [PATCH] Linking swipe animate to stateTransition to that it gets
 properly reset afterwards

Bug: 77848165
Change-Id: Ie4ae2fe933b37b66568c0a8eb29c85b9869a9987
---
 quickstep/src/com/android/quickstep/ActivityControlHelper.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/ActivityControlHelper.java b/quickstep/src/com/android/quickstep/ActivityControlHelper.java
index 0ea729f280..52db0017b8 100644
--- a/quickstep/src/com/android/quickstep/ActivityControlHelper.java
+++ b/quickstep/src/com/android/quickstep/ActivityControlHelper.java
@@ -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);
         }