Merge "Add mStartState to determine if user swipes up from Home." into ub-launcher3-edmonton

This commit is contained in:
TreeHugger Robot
2018-05-23 17:57:58 +00:00
committed by Android (Google) Code Review
3 changed files with 6 additions and 3 deletions

View File

@@ -72,6 +72,7 @@ public abstract class AbstractStateChangeTouchController
private boolean mNoIntercept;
protected int mStartContainerType;
protected LauncherState mStartState;
protected LauncherState mFromState;
protected LauncherState mToState;
protected AnimatorPlaybackController mCurrentAnimation;
@@ -235,8 +236,10 @@ public abstract class AbstractStateChangeTouchController
@Override
public void onDragStart(boolean start) {
mStartState = mLauncher.getStateManager().getState();
if (mCurrentAnimation == null) {
mFromState = mToState = null;
mFromState = mStartState;
mToState = null;
mAtomicComponentsController = null;
reinitCurrentAnimation(false, mDetector.wasInitialTouchPositive());
mDisplacementShift = 0;