Merge "Add CUJ_LAUNCHER_APP_SWIPE_TO_RECENTS" into tm-qpr-dev (d8251475) · Commits · e / os / android_frameworks_base

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

+7 −1

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_IN
		import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_APP_LAUNCH_FROM_ICON;
		import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_APP_LAUNCH_FROM_RECENTS;
		import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_APP_LAUNCH_FROM_WIDGET;
		import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_APP_SWIPE_TO_RECENTS;
		import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_OPEN_ALL_APPS;
		import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_QUICK_SWITCH;
		import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_UNLOCK_ENTRANCE_ANIMATION;
		@@ -225,6 +226,7 @@ public class InteractionJankMonitor {
		public static final int CUJ_LAUNCHER_UNLOCK_ENTRANCE_ANIMATION = 63;
		public static final int CUJ_LOCKSCREEN_OCCLUSION = 64;
		public static final int CUJ_RECENTS_SCROLLING = 65;
		public static final int CUJ_LAUNCHER_APP_SWIPE_TO_RECENTS = 66;

		private static final int NO_STATSD_LOGGING = -1;

		@@ -299,6 +301,7 @@ public class InteractionJankMonitor {
		UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_UNLOCK_ENTRANCE_ANIMATION,
		UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LOCKSCREEN_OCCLUSION,
		UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__RECENTS_SCROLLING,
		UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_APP_SWIPE_TO_RECENTS,
		};

		private static volatile InteractionJankMonitor sInstance;
		@@ -384,7 +387,8 @@ public class InteractionJankMonitor {
		CUJ_SHADE_CLEAR_ALL,
		CUJ_LAUNCHER_UNLOCK_ENTRANCE_ANIMATION,
		CUJ_LOCKSCREEN_OCCLUSION,
		CUJ_RECENTS_SCROLLING
		CUJ_RECENTS_SCROLLING,
		CUJ_LAUNCHER_APP_SWIPE_TO_RECENTS
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface CujType {
		@@ -899,6 +903,8 @@ public class InteractionJankMonitor {
		return "LOCKSCREEN_OCCLUSION";
		case CUJ_RECENTS_SCROLLING:
		return "RECENTS_SCROLLING";
		case CUJ_LAUNCHER_APP_SWIPE_TO_RECENTS:
		return "LAUNCHER_APP_SWIPE_TO_RECENTS";
		}
		return "UNKNOWN";
		}

packages/SystemUI/shared/src/com/android/systemui/shared/system/InteractionJankMonitorWrapper.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -53,6 +53,8 @@ public final class InteractionJankMonitorWrapper {
		InteractionJankMonitor.CUJ_LAUNCHER_UNLOCK_ENTRANCE_ANIMATION;
		public static final int CUJ_RECENTS_SCROLLING =
		InteractionJankMonitor.CUJ_RECENTS_SCROLLING;
		public static final int CUJ_APP_SWIPE_TO_RECENTS =
		InteractionJankMonitor.CUJ_LAUNCHER_APP_SWIPE_TO_RECENTS;

		@IntDef({
		CUJ_APP_LAUNCH_FROM_RECENTS,
		@@ -62,7 +64,8 @@ public final class InteractionJankMonitorWrapper {
		CUJ_QUICK_SWITCH,
		CUJ_APP_LAUNCH_FROM_WIDGET,
		CUJ_LAUNCHER_UNLOCK_ENTRANCE_ANIMATION,
		CUJ_RECENTS_SCROLLING
		CUJ_RECENTS_SCROLLING,
		CUJ_APP_SWIPE_TO_RECENTS
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface CujType {