Tony Wickham
52240a3aa0
This cleans up the code and ensures that the current state animation is always initialized when we get drag events. Also log when we pass through states. Bug: 78017680 Change-Id: I54ab42923ed539940ea708973ad65f5793669c11
76 lines
2.7 KiB
Java
76 lines
2.7 KiB
Java
package com.android.launcher3.uioverrides;
|
|
|
|
import static com.android.launcher3.LauncherState.ALL_APPS;
|
|
import static com.android.launcher3.LauncherState.NORMAL;
|
|
|
|
import android.view.MotionEvent;
|
|
|
|
import com.android.launcher3.AbstractFloatingView;
|
|
import com.android.launcher3.Launcher;
|
|
import com.android.launcher3.LauncherState;
|
|
import com.android.launcher3.touch.AbstractStateChangeTouchController;
|
|
import com.android.launcher3.touch.SwipeDetector;
|
|
import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
|
|
|
|
/**
|
|
* TouchController to switch between NORMAL and ALL_APPS state.
|
|
*/
|
|
public class AllAppsSwipeController extends AbstractStateChangeTouchController {
|
|
|
|
private MotionEvent mTouchDownEvent;
|
|
|
|
public AllAppsSwipeController(Launcher l) {
|
|
super(l, SwipeDetector.VERTICAL);
|
|
}
|
|
|
|
@Override
|
|
protected boolean canInterceptTouch(MotionEvent ev) {
|
|
if (ev.getAction() == MotionEvent.ACTION_DOWN) {
|
|
mTouchDownEvent = ev;
|
|
}
|
|
if (mCurrentAnimation != null) {
|
|
// If we are already animating from a previous state, we can intercept.
|
|
return true;
|
|
}
|
|
if (AbstractFloatingView.getTopOpenView(mLauncher) != null) {
|
|
return false;
|
|
}
|
|
if (!mLauncher.isInState(NORMAL) && !mLauncher.isInState(ALL_APPS)) {
|
|
// Don't listen for the swipe gesture if we are already in some other state.
|
|
return false;
|
|
}
|
|
if (mLauncher.isInState(ALL_APPS) && !mLauncher.getAppsView().shouldContainerScroll(ev)) {
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
@Override
|
|
protected LauncherState getTargetState(LauncherState fromState, boolean isDragTowardPositive) {
|
|
if (fromState == NORMAL && isDragTowardPositive) {
|
|
return ALL_APPS;
|
|
} else if (fromState == ALL_APPS && !isDragTowardPositive) {
|
|
return NORMAL;
|
|
}
|
|
return fromState;
|
|
}
|
|
|
|
@Override
|
|
protected int getLogContainerTypeForNormalState() {
|
|
return mLauncher.getDragLayer().isEventOverHotseat(mTouchDownEvent) ?
|
|
ContainerType.HOTSEAT : ContainerType.WORKSPACE;
|
|
}
|
|
|
|
@Override
|
|
protected float initCurrentAnimation() {
|
|
float range = getShiftRange();
|
|
long maxAccuracy = (long) (2 * range);
|
|
mCurrentAnimation = mLauncher.getStateManager()
|
|
.createAnimationToNewWorkspace(mToState, maxAccuracy);
|
|
float startVerticalShift = mFromState.getVerticalProgress(mLauncher) * range;
|
|
float endVerticalShift = mToState.getVerticalProgress(mLauncher) * range;
|
|
float totalShift = endVerticalShift - startVerticalShift;
|
|
return 1 / totalShift;
|
|
}
|
|
}
|