From 1cc12ebc121f289db3e481aa5f9c4b72514ad52f Mon Sep 17 00:00:00 2001 From: Tony Wickham Date: Thu, 22 Oct 2020 13:59:09 -0700 Subject: [PATCH] End the attaching animation early when we settle on the end target The attaching animation can take longer than the transition to recents when you let go, and the ADJACENT_PAGE_OFFSET calculation is different when there's a running task vs not. So after the transition to recents ended, the calculation of the still playing attaching animation would change, causing the jump you see in the bug. Now we make sure to end the attaching animation if it's still running when we settle on an end target to avoid this issue. Fixes: 168563692 Change-Id: I3f37aecf9c93f2ec63dbdce561e7f5ba11be89cc --- quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java index cc109f608c..239c0e4d0e 100644 --- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java +++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java @@ -800,6 +800,8 @@ public abstract class AbsSwipeUpHandler, Q extends } private void onSettledOnEndTarget() { + // Fast-finish the attaching animation if it's still running. + maybeUpdateRecentsAttachedState(false); final GestureEndTarget endTarget = mGestureState.getEndTarget(); switch (endTarget) { case HOME: