Merge "Revert "Add CUJ constants for launching and saving App Pairs"" into main (d05b16c3) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/jank/Cuj.java

+1 −16

Original line number	Original line	Diff line number	Diff line
	@@ -124,13 +124,10 @@ public class Cuj {
	public static final int CUJ_BACK_PANEL_ARROW = 88;		public static final int CUJ_BACK_PANEL_ARROW = 88;
	public static final int CUJ_LAUNCHER_CLOSE_ALL_APPS_BACK = 89;		public static final int CUJ_LAUNCHER_CLOSE_ALL_APPS_BACK = 89;
	public static final int CUJ_LAUNCHER_SEARCH_QSB_WEB_SEARCH = 90;		public static final int CUJ_LAUNCHER_SEARCH_QSB_WEB_SEARCH = 90;
	public static final int CUJ_LAUNCHER_LAUNCH_APP_PAIR_FROM_WORKSPACE = 91;
	public static final int CUJ_LAUNCHER_LAUNCH_APP_PAIR_FROM_TASKBAR = 92;
	public static final int CUJ_LAUNCHER_SAVE_APP_PAIR = 93;

	// When adding a CUJ, update this and make sure to also update CUJ_TO_STATSD_INTERACTION_TYPE.		// When adding a CUJ, update this and make sure to also update CUJ_TO_STATSD_INTERACTION_TYPE.
	@VisibleForTesting		@VisibleForTesting
	static final int LAST_CUJ = CUJ_LAUNCHER_SAVE_APP_PAIR;		static final int LAST_CUJ = CUJ_LAUNCHER_SEARCH_QSB_WEB_SEARCH;

	/** @hide */		/** @hide */
	@IntDef({		@IntDef({
	@@ -215,9 +212,6 @@ public class Cuj {
	CUJ_BACK_PANEL_ARROW,		CUJ_BACK_PANEL_ARROW,
	CUJ_LAUNCHER_CLOSE_ALL_APPS_BACK,		CUJ_LAUNCHER_CLOSE_ALL_APPS_BACK,
	CUJ_LAUNCHER_SEARCH_QSB_WEB_SEARCH,		CUJ_LAUNCHER_SEARCH_QSB_WEB_SEARCH,
	CUJ_LAUNCHER_LAUNCH_APP_PAIR_FROM_WORKSPACE,
	CUJ_LAUNCHER_LAUNCH_APP_PAIR_FROM_TASKBAR,
	CUJ_LAUNCHER_SAVE_APP_PAIR
	})		})
	@Retention(RetentionPolicy.SOURCE)		@Retention(RetentionPolicy.SOURCE)
	public @interface CujType {		public @interface CujType {
	@@ -312,9 +306,6 @@ public class Cuj {
	CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_BACK_PANEL_ARROW] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__BACK_PANEL_ARROW;		CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_BACK_PANEL_ARROW] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__BACK_PANEL_ARROW;
	CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_LAUNCHER_CLOSE_ALL_APPS_BACK] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_CLOSE_ALL_APPS_BACK;		CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_LAUNCHER_CLOSE_ALL_APPS_BACK] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_CLOSE_ALL_APPS_BACK;
	CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_LAUNCHER_SEARCH_QSB_WEB_SEARCH] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_SEARCH_QSB_WEB_SEARCH;		CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_LAUNCHER_SEARCH_QSB_WEB_SEARCH] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_SEARCH_QSB_WEB_SEARCH;
	CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_LAUNCHER_LAUNCH_APP_PAIR_FROM_WORKSPACE] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_LAUNCH_APP_PAIR_FROM_WORKSPACE;
	CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_LAUNCHER_LAUNCH_APP_PAIR_FROM_TASKBAR] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_LAUNCH_APP_PAIR_FROM_TASKBAR;
	CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_LAUNCHER_SAVE_APP_PAIR] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_SAVE_APP_PAIR;
	}		}

	private Cuj() {		private Cuj() {
	@@ -493,12 +484,6 @@ public class Cuj {
	return "LAUNCHER_CLOSE_ALL_APPS_BACK";		return "LAUNCHER_CLOSE_ALL_APPS_BACK";
	case CUJ_LAUNCHER_SEARCH_QSB_WEB_SEARCH:		case CUJ_LAUNCHER_SEARCH_QSB_WEB_SEARCH:
	return "LAUNCHER_SEARCH_QSB_WEB_SEARCH";		return "LAUNCHER_SEARCH_QSB_WEB_SEARCH";
	case CUJ_LAUNCHER_LAUNCH_APP_PAIR_FROM_WORKSPACE:
	return "LAUNCHER_LAUNCH_APP_PAIR_FROM_WORKSPACE";
	case CUJ_LAUNCHER_LAUNCH_APP_PAIR_FROM_TASKBAR:
	return "LAUNCHER_LAUNCH_APP_PAIR_FROM_TASKBAR";
	case CUJ_LAUNCHER_SAVE_APP_PAIR:
	return "LAUNCHER_SAVE_APP_PAIR";
	}		}
	return "UNKNOWN";		return "UNKNOWN";
	}		}

core/java/com/android/internal/jank/InteractionJankMonitor.java

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -165,9 +165,6 @@ public class InteractionJankMonitor {
	@Deprecated public static final int CUJ_PREDICTIVE_BACK_CROSS_ACTIVITY = Cuj.CUJ_PREDICTIVE_BACK_CROSS_ACTIVITY;		@Deprecated public static final int CUJ_PREDICTIVE_BACK_CROSS_ACTIVITY = Cuj.CUJ_PREDICTIVE_BACK_CROSS_ACTIVITY;
	@Deprecated public static final int CUJ_PREDICTIVE_BACK_CROSS_TASK = Cuj.CUJ_PREDICTIVE_BACK_CROSS_TASK;		@Deprecated public static final int CUJ_PREDICTIVE_BACK_CROSS_TASK = Cuj.CUJ_PREDICTIVE_BACK_CROSS_TASK;
	@Deprecated public static final int CUJ_PREDICTIVE_BACK_HOME = Cuj.CUJ_PREDICTIVE_BACK_HOME;		@Deprecated public static final int CUJ_PREDICTIVE_BACK_HOME = Cuj.CUJ_PREDICTIVE_BACK_HOME;
	@Deprecated public static final int CUJ_LAUNCHER_LAUNCH_APP_PAIR_FROM_WORKSPACE = Cuj.CUJ_LAUNCHER_LAUNCH_APP_PAIR_FROM_WORKSPACE;
	@Deprecated public static final int CUJ_LAUNCHER_LAUNCH_APP_PAIR_FROM_TASKBAR = Cuj.CUJ_LAUNCHER_LAUNCH_APP_PAIR_FROM_TASKBAR;
	@Deprecated public static final int CUJ_LAUNCHER_SAVE_APP_PAIR = Cuj.CUJ_LAUNCHER_SAVE_APP_PAIR;

	private static class InstanceHolder {		private static class InstanceHolder {
	public static final InteractionJankMonitor INSTANCE =		public static final InteractionJankMonitor INSTANCE =