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 "Log dismissing or launching recent tasks" into ub-launcher3-master

Browse Source
This commit is contained in:
Tony Wickham
2018-04-06 22:55:50 +00:00
committed by Android (Google) Code Review
parent 3541ac10a1 9bd862e588
commit 9ae484b95d
8 changed files with 81 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -250,24 +250,24 @@ public abstract class AbstractStateChangeTouchController extends AnimatorListene
}
protected void onSwipeInteractionCompleted(LauncherState targetState, int logAction) {
if (targetState != mFromState) {
// Transition complete. log the action
mLauncher.getUserEventDispatcher().logStateChangeAction(logAction,
getDirectionForLog(),
mStartContainerType,
mFromState.containerType,
mToState.containerType,
mLauncher.getWorkspace().getCurrentPage());
}
clearState();
boolean shouldGoToTargetState = true;
if (mPendingAnimation != null) {
boolean reachedTarget = mToState == targetState;
mPendingAnimation.finish(reachedTarget);
mPendingAnimation.finish(reachedTarget, logAction);
mPendingAnimation = null;
shouldGoToTargetState = !reachedTarget;
}
if (shouldGoToTargetState) {
if (targetState != mFromState) {
// Transition complete. log the action
mLauncher.getUserEventDispatcher().logStateChangeAction(logAction,
getDirectionForLog(),
mStartContainerType,
mFromState.containerType,
mToState.containerType,
mLauncher.getWorkspace().getCurrentPage());
}
mLauncher.getStateManager().goToState(targetState, false /* animated */);
}
}