PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reset RecentsView#mNextPage when swiping to home am: d552132d0b

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15828992

Change-Id: I9c8c0ce872cd205a25ca3154b842b9cc98a9c578
This commit is contained in:
Tony Wickham
2021-09-15 00:28:58 +00:00
committed by Automerger Merge Worker
parent 6a976df53e d552132d0b
commit 46192d288a
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
+1 -1
View File
@@ -197,7 +197,7 @@ public class StaggeredWorkspaceAnim {
launcher.getStateManager().createAtomicAnimation(BACKGROUND_APP, NORMAL, config).start();
// Stop scrolling so that it doesn't interfere with the translation offscreen.
launcher.<RecentsView>getOverviewPanel().getScroller().forceFinished(true);
launcher.<RecentsView>getOverviewPanel().forceFinishScroller();
if (animateOverviewScrim) {
launcher.getWorkspace().getStateTransitionAnimation()
quickstep/src/com/android/quickstep/util/WorkspaceRevealAnim.java
+1 -1
View File
@@ -120,7 +120,7 @@ public class WorkspaceRevealAnim {
launcher.getStateManager().createAtomicAnimation(BACKGROUND_APP, NORMAL, config).start();
// Stop scrolling so that it doesn't interfere with the translation offscreen.
launcher.<RecentsView>getOverviewPanel().getScroller().forceFinished(true);
launcher.<RecentsView>getOverviewPanel().forceFinishScroller();
if (animateOverviewScrim) {
launcher.getWorkspace().getStateTransitionAnimation()
src/com/android/launcher3/PagedView.java
+8 -6
View File
@@ -254,7 +254,7 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
}
mOrientationHandler.set(this, VIEW_SCROLL_TO, newPosition);
mScroller.startScroll(mScroller.getCurrX(), 0, newPosition - mScroller.getCurrX(), 0);
forceFinishScroller(true);
forceFinishScroller();
}
/**
@@ -276,14 +276,16 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
}
}
private void forceFinishScroller(boolean resetNextPage) {
/**
* Immediately finishes any in-progress scroll, maintaining the current position. Also sets
* mNextPage = INVALID_PAGE and calls pageEndTransition().
*/
public void forceFinishScroller() {
mScroller.forceFinished(true);
// We need to clean up the next page here to avoid computeScrollHelper from
// updating current page on the pass.
if (resetNextPage) {
mNextPage = INVALID_PAGE;
pageEndTransition();
}
mNextPage = INVALID_PAGE;
pageEndTransition();
}
private int validateNewPage(int newPage) {