Cancelling window transition when starting focus animation.

Change-Id: I34926215098c3226e99cc224c36d315fd1736b0a

diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java
index 67b2946..4e75d5a 100644 (file)
--- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java
@@ -1526,6 +1526,10 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal
     }
 
     public final void onBusEvent(IterateRecentsEvent event) {
+        if (!mEnterAnimationComplete) {
+            // Cancel the previous task's window transition before animating the focused state
+            EventBus.getDefault().send(new CancelEnterRecentsWindowAnimationEvent(null));
+        }
         mLayoutAlgorithm.animateFocusState(mLayoutAlgorithm.getDefaultFocusState());
     }