aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-16 09:08:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Cleanup state properly when interacting during gesture nav transition" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-06-01 21:02:29 +00:00
committed by Android (Google) Code Review
parent 9ccd3c5e12 f8d731a808
commit b13200c6b1
3 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
View File

@@ -1398,6 +1398,10 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
mLauncherTransitionController.getNormalController().getAnimationPlayer().end();
mLauncherTransitionController = null;
}
if (mRecentsView != null) {
mRecentsView.abortScrollerAnimation();
}
}
/**
@@ -1416,7 +1420,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
private void resetStateForAnimationCancel() {
boolean wasVisible = mWasLauncherAlreadyVisible || mGestureStarted;
mActivityInterface.onTransitionCancelled(wasVisible);
mActivityInterface.onTransitionCancelled(wasVisible, mGestureState.getEndTarget());
// Leave the pending invisible flag, as it may be used by wallpaper open animation.
if (mActivity != null) {

12
quickstep/src/com/android/quickstep/BaseActivityInterface.java
View File

@@ -86,12 +86,22 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
mBackgroundState = backgroundState;
}
public void onTransitionCancelled(boolean activityVisible) {
/**
* Called when the current gesture transition is cancelled.
* @param activityVisible Whether the user can see the changes we make here, so try to animate.
* @param endTarget If the gesture ended before we got cancelled, where we were headed.
*/
public void onTransitionCancelled(boolean activityVisible,
@Nullable GestureState.GestureEndTarget endTarget) {
ACTIVITY_TYPE activity = getCreatedActivity();
if (activity == null) {
return;
}
STATE_TYPE startState = activity.getStateManager().getRestState();
if (endTarget != null) {
// We were on our way to this state when we got canceled, end there instead.
startState = stateFromGestureEndTarget(endTarget);
}
activity.getStateManager().goToState(startState, activityVisible);
}

9
src/com/android/launcher3/PagedView.java
View File

@@ -250,6 +250,15 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
forceFinishScroller(true);
}
/**
* Immediately finishes any overscroll effect and jumps to the end of the scroller animation.
*/
public void abortScrollerAnimation() {
mEdgeGlowLeft.finish();
mEdgeGlowRight.finish();
abortScrollerAnimation(true);
}
private void abortScrollerAnimation(boolean resetNextPage) {
mScroller.abortAnimation();
// We need to clean up the next page here to avoid computeScrollHelper from