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

Merge "Fix BaseSwipeDetector#setState() called inside another setState()" into ub-launcher3-master

Browse Source
This commit is contained in:
TreeHugger Robot
2020-01-15 22:03:01 +00:00
committed by Android (Google) Code Review
parent e16a2ba379 3f330429a3
commit 2abd13a80b
3 changed files with 39 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
View File

@@ -508,7 +508,7 @@ public abstract class AbstractStateChangeTouchController
mAtomicComponentsController.getAnimationPlayer().end();
mAtomicComponentsController = null;
}
cancelAnimationControllers();
clearState();
boolean shouldGoToTargetState = true;
if (mPendingAnimation != null) {
boolean reachedTarget = mToState == targetState;
@@ -546,13 +546,13 @@ public abstract class AbstractStateChangeTouchController
mAtomicAnim = null;
}
mScheduleResumeAtomicComponent = false;
mDetector.finishedScrolling();
mDetector.setDetectableScrollConditions(0, false);
}
private void cancelAnimationControllers() {
mCurrentAnimation = null;
cancelAtomicComponentsController();
mDetector.finishedScrolling();
mDetector.setDetectableScrollConditions(0, false);
}
private void cancelAtomicComponentsController() {