commit | c830bef923200e97ad8d0ef9bf37d0c121d7e56d | [log] [tgz] |
---|---|---|
author | Tony Wickham <twickham@google.com> | Mon Aug 10 15:06:02 2020 -0700 |
committer | Tony Wickham <twickham@google.com> | Mon Aug 10 15:19:33 2020 -0700 |
tree | db4c270527f3debff327ce09819196afee656f39 | |
parent | cf5aea05b3888ea0adc8a53fad62987405206eeb [diff] |
Don't reapply window transform if we are already running a window anim Bug: 149934536 Change-Id: I3fa7f0b2581ca83923a42f37f52850b02c22e995
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 c10527b..d2fee30 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 @@ // 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();