Merge "Instrumenting swiping up to all apps for jank" into sc-dev am: 06df8d7262

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/13536203

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id700d71b56ee79949544c3d28f1a4ac14acfcb6d
This commit is contained in:
Vadim Tryshev authored and Automerger Merge Worker committed 2021-02-23 19:01:07 +00:00
commit df12e20e94
2 files changed
+51 -1

No files matched your search

@@ -49,6 +49,7 @@ import com.android.launcher3.uioverrides.states.OverviewState;
import com.android.quickstep.SystemUiProxy;
import com.android.quickstep.util.LayoutUtils;
import com.android.quickstep.views.RecentsView;
import com.android.systemui.shared.system.InteractionJankMonitorWrapper;
/**
* Touch controller for handling various state transitions in portrait UI.
@@ -319,4 +320,44 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr
return baseInterpolator.getInterpolation(v);
}
}
@Override
public boolean onControllerInterceptTouchEvent(MotionEvent ev) {
switch (ev.getAction()) {
case MotionEvent.ACTION_DOWN:
InteractionJankMonitorWrapper.begin(
mLauncher.getRootView(), InteractionJankMonitorWrapper.CUJ_OPEN_ALL_APPS);
break;
case MotionEvent.ACTION_CANCEL:
case MotionEvent.ACTION_UP:
InteractionJankMonitorWrapper.cancel(
InteractionJankMonitorWrapper.CUJ_OPEN_ALL_APPS);
break;
}
return super.onControllerInterceptTouchEvent(ev);
}
@Override
protected void onReinitToState(LauncherState newToState) {
super.onReinitToState(newToState);
if (newToState != ALL_APPS) {
InteractionJankMonitorWrapper.cancel(InteractionJankMonitorWrapper.CUJ_OPEN_ALL_APPS);
}
}
@Override
protected void onReachedFinalState(LauncherState toState) {
super.onReinitToState(toState);
if (toState == ALL_APPS) {
InteractionJankMonitorWrapper.end(InteractionJankMonitorWrapper.CUJ_OPEN_ALL_APPS);
}
}
@Override
protected void clearState() {
super.clearState();
InteractionJankMonitorWrapper.cancel(InteractionJankMonitorWrapper.CUJ_OPEN_ALL_APPS);
}
}
@@ -125,7 +125,7 @@ public abstract class AbstractStateChangeTouchController
protected abstract boolean canInterceptTouch(MotionEvent ev);
@Override
public final boolean onControllerInterceptTouchEvent(MotionEvent ev) {
public boolean onControllerInterceptTouchEvent(MotionEvent ev) {
if (ev.getAction() == MotionEvent.ACTION_DOWN) {
mNoIntercept = !canInterceptTouch(ev);
if (mNoIntercept) {
@@ -194,6 +194,8 @@ public abstract class AbstractStateChangeTouchController
: reachedToState ? mToState : mFromState;
LauncherState newToState = getTargetState(newFromState, isDragTowardPositive);
onReinitToState(newToState);
if (newFromState == mFromState && newToState == mToState || (newFromState == newToState)) {
return false;
}
@@ -232,6 +234,12 @@ public abstract class AbstractStateChangeTouchController
return true;
}
protected void onReinitToState(LauncherState newToState) {
}
protected void onReachedFinalState(LauncherState newToState) {
}
protected boolean goingBetweenNormalAndOverview(LauncherState fromState,
LauncherState toState) {
return (fromState == NORMAL || fromState == OVERVIEW)
@@ -526,6 +534,7 @@ public abstract class AbstractStateChangeTouchController
mAtomicComponentsController.getAnimationPlayer().end();
mAtomicComponentsController = null;
}
onReachedFinalState(mToState);
clearState();
boolean shouldGoToTargetState = mGoingBetweenStates || (mToState != targetState);
if (shouldGoToTargetState) {