commit e14b55c2a94a255750bca8b2fa4e068fcbeba0cc
author Tony Wickham <twickham@google.com> Tue Aug 11 00:19:28 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 11 00:19:28 2020 +0000
tree c49a1967c3156d5cbcd5da57b6bd8c7cd26726cf
parent b460ff1ef1f7fac734f1d0411fd7284e6c1eea7b
parent 06513f11c2304a371a7c79cec371562d65393322

Merge "Don't reapply window transform if we are already running a window anim" into ub-launcher3-rvc-qpr-dev

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();