Merge "Add CUJ annotations for going to Recents from Home" into main (e5451b10) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -38,6 +38,7 @@ import android.graphics.PointF;
		import android.view.MotionEvent;
		import android.view.ViewConfiguration;

		import com.android.internal.jank.Cuj;
		import com.android.launcher3.Launcher;
		import com.android.launcher3.LauncherState;
		import com.android.launcher3.Utilities;
		@@ -53,6 +54,7 @@ import com.android.quickstep.util.AnimatorControllerWithResistance;
		import com.android.quickstep.util.MotionPauseDetector;
		import com.android.quickstep.util.OverviewToHomeAnim;
		import com.android.quickstep.views.RecentsView;
		import com.android.systemui.shared.system.InteractionJankMonitorWrapper;

		import java.util.function.Consumer;

		@@ -148,6 +150,8 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch
		mMotionPauseDetector.clear();

		if (handlingOverviewAnim()) {
		InteractionJankMonitorWrapper.begin(mRecentsView, Cuj.CUJ_LAUNCHER_APP_SWIPE_TO_RECENTS,
		"Home");
		mMotionPauseDetector.setOnMotionPauseListener(this::onMotionPauseDetected);
		}

		@@ -182,6 +186,7 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch
		if (mStartedOverview) {
		goToOverviewOrHomeOnDragEnd(velocity);
		} else {
		InteractionJankMonitorWrapper.cancel(Cuj.CUJ_LAUNCHER_APP_SWIPE_TO_RECENTS);
		super.onDragEnd(velocity);
		}

		@@ -237,6 +242,7 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch

		private void maybeSwipeInteractionToOverviewComplete() {
		if (mReachedOverview && !mDetector.isDraggingState()) {
		InteractionJankMonitorWrapper.end(Cuj.CUJ_LAUNCHER_APP_SWIPE_TO_RECENTS);
		onSwipeInteractionCompleted(OVERVIEW);
		}
		}
		@@ -280,6 +286,7 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch
		if (goToHomeInsteadOfOverview) {
		new OverviewToHomeAnim(mLauncher, () -> onSwipeInteractionCompleted(NORMAL), null)
		.animateWithVelocity(velocity);
		InteractionJankMonitorWrapper.cancel(Cuj.CUJ_LAUNCHER_APP_SWIPE_TO_RECENTS);
		}
		if (mReachedOverview) {
		float distanceDp = dpiFromPx(Math.max(

quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -193,6 +193,8 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
		mMotionPauseDetector.clear();
		if (start) {
		InteractionJankMonitorWrapper.begin(mRecentsView, Cuj.CUJ_LAUNCHER_QUICK_SWITCH);
		InteractionJankMonitorWrapper.begin(mRecentsView, Cuj.CUJ_LAUNCHER_APP_SWIPE_TO_RECENTS,
		"Home");

		mStartState = mLauncher.getStateManager().getState();

		@@ -350,6 +352,7 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
		.dispatchOnStart();
		return;
		}
		InteractionJankMonitorWrapper.cancel(Cuj.CUJ_LAUNCHER_APP_SWIPE_TO_RECENTS);

		final LauncherState targetState;
		if (horizontalFling && verticalFling) {
		@@ -471,6 +474,8 @@ public class NoButtonQuickSwitchTouchController implements TouchController,

		if (targetState == QUICK_SWITCH_FROM_HOME) {
		InteractionJankMonitorWrapper.end(Cuj.CUJ_LAUNCHER_QUICK_SWITCH);
		} else if (targetState == OVERVIEW) {
		InteractionJankMonitorWrapper.end(Cuj.CUJ_LAUNCHER_APP_SWIPE_TO_RECENTS);
		}

		mLauncher.getStateManager().goToState(targetState, false, forEndCallback(this::clearState));