Merge "Fix RecentsView scroll linking" into ub-launcher3-rvc-dev

This commit is contained in:
TreeHugger Robot
2020-06-19 23:28:55 +00:00
committed by Android (Google) Code Review
2 changed files with 3 additions and 4 deletions

View File

@@ -121,10 +121,6 @@ public abstract class BaseSwipeUpHandler<T extends StatefulActivity<?>, 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<T extends StatefulActivity<?>, Q extend
runOnRecentsAnimationStart(() ->
mRecentsView.setRecentsAnimationTargets(mRecentsAnimationController,
mRecentsAnimationTargets));
mRecentsViewScrollLinked = true;
}
protected void startNewTask(Consumer<Boolean> resultCallback) {

View File

@@ -1664,6 +1664,8 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
!mOrientationState.canLauncherRotate() && isInLandscape);
resetPaddingFromTaskSize();
requestLayout();
// Reapply the current page to update page scrolls.
setCurrentPage(mCurrentPage);
}
}