diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandler.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandler.java index 9db6576765..02bae64274 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandler.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandler.java @@ -121,10 +121,6 @@ public abstract class BaseSwipeUpHandler, Q extend }); mRecentsView.setOnScrollChangeListener((v, scrollX, scrollY, oldScrollX, oldScrollY) -> { - // Wait until the first scroll event before applying scroll to taskViewSimulator. - // Since, by default the current/running task already centered, this ensures that we - // do not move the running task, in case RecentsView has not yet laid out completely. - mRecentsViewScrollLinked = true; if (moveWindowWithRecentsScroll()) { updateFinalShift(); } @@ -132,6 +128,7 @@ public abstract class BaseSwipeUpHandler, Q extend runOnRecentsAnimationStart(() -> mRecentsView.setRecentsAnimationTargets(mRecentsAnimationController, mRecentsAnimationTargets)); + mRecentsViewScrollLinked = true; } protected void startNewTask(Consumer resultCallback) { diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java index e89e56641b..cb22570981 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java @@ -1664,6 +1664,8 @@ public abstract class RecentsView extends PagedView !mOrientationState.canLauncherRotate() && isInLandscape); resetPaddingFromTaskSize(); requestLayout(); + // Reapply the current page to update page scrolls. + setCurrentPage(mCurrentPage); } }