From c830bef923200e97ad8d0ef9bf37d0c121d7e56d Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Mon, 10 Aug 2020 15:06:02 -0700
Subject: [PATCH] Don't reapply window transform if we are already running a
 window anim

Bug: 149934536
Change-Id: I3fa7f0b2581ca83923a42f37f52850b02c22e995
---
 .../src/com/android/quickstep/AbsSwipeUpHandler.java        | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/AbsSwipeUpHandler.java
index c10527bcfe..d2fee30ca3 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -530,7 +530,11 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
         // much the window is bound by overscroll (vs moving freely).
         if (animate) {
             ValueAnimator reapplyWindowTransformAnim = ValueAnimator.ofFloat(0, 1);
-            reapplyWindowTransformAnim.addUpdateListener(anim -> applyWindowTransform());
+            reapplyWindowTransformAnim.addUpdateListener(anim -> {
+                if (mRunningWindowAnim == null) {
+                    applyWindowTransform();
+                }
+            });
             reapplyWindowTransformAnim.setDuration(RECENTS_ATTACH_DURATION).start();
         } else {
             applyWindowTransform();