commit 06513f11c2304a371a7c79cec371562d65393322
author Tony Wickham <twickham@google.com> Mon Aug 10 15:06:02 2020 -0700
committer Tony Wickham <twickham@google.com> Mon Aug 10 22:20:36 2020 +0000
tree 4f878fd38f866bd1eb1a74cb114a4c121ebb1450
parent 03a4a0cd530c6d13f01882e81568ab1544030c12

Don't reapply window transform if we are already running a window anim

Bug: 149934536
Change-Id: I3fa7f0b2581ca83923a42f37f52850b02c22e995
Merged-In: I3fa7f0b2581ca83923a42f37f52850b02c22e995

quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandlerV2.java

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandlerV2.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandlerV2.java
index ed33532..0aa1486 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandlerV2.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandlerV2.java
@@ -493,7 +493,11 @@
         // 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();