Merge "Split interaction java mapping for enter desktop mode drag hold/release." into main (23cbe12b) · Commits · e / os / android_frameworks_base

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

+26 −9

Original line number	Diff line number	Diff line
		@@ -161,12 +161,12 @@ public class Cuj {
		public static final int CUJ_DESKTOP_MODE_RESIZE_WINDOW = 106;

		/**
		* Track entering desktop mode interaction via app handle drag.
		* Track app handle drag and hold interaction.
		*
		* <p>Tracking starts when the app handle is dragged and
		* finishes when the window animation to desktop ends after app handle release.
		* finishes immediately after app handle release, before starting a new transition.
		*/
		public static final int CUJ_DESKTOP_MODE_ENTER_MODE_APP_HANDLE_DRAG = 107;
		public static final int CUJ_DESKTOP_MODE_ENTER_APP_HANDLE_DRAG_HOLD = 107;

		/** Track exiting desktop mode interaction. */
		public static final int CUJ_DESKTOP_MODE_EXIT_MODE = 108;
		@@ -197,8 +197,21 @@ public class Cuj {
		/** Track launching an app through the Launcher Keyboard Quick Switch View */
		public static final int CUJ_LAUNCHER_KEYBOARD_QUICK_SWITCH_APP_LAUNCH = 115;

		/**
		* Track entering desktop mode interaction via app handle drag release.
		*
		* <p>Tracking starts when the app handle is released and
		* finishes when one of the three possible animations end:
		* <ul>
		* <li>release to desktop</li>
		* <li>release to split-screen</li>
		* <li>release to back to full-screen</li>
		* </ul>.
		*/
		public static final int CUJ_DESKTOP_MODE_ENTER_APP_HANDLE_DRAG_RELEASE = 116;

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

		/** @hide */
		@IntDef({
		@@ -297,7 +310,7 @@ public class Cuj {
		CUJ_DESKTOP_MODE_MAXIMIZE_WINDOW,
		CUJ_FOLD_ANIM,
		CUJ_DESKTOP_MODE_RESIZE_WINDOW,
		CUJ_DESKTOP_MODE_ENTER_MODE_APP_HANDLE_DRAG,
		CUJ_DESKTOP_MODE_ENTER_APP_HANDLE_DRAG_HOLD,
		CUJ_DESKTOP_MODE_ENTER_MODE_APP_HANDLE_MENU,
		CUJ_DESKTOP_MODE_EXIT_MODE,
		CUJ_DESKTOP_MODE_MINIMIZE_WINDOW,
		@@ -305,7 +318,8 @@ public class Cuj {
		CUJ_STATUS_BAR_LAUNCH_DIALOG_FROM_CHIP,
		CUJ_LAUNCHER_KEYBOARD_QUICK_SWITCH_OPEN,
		CUJ_LAUNCHER_KEYBOARD_QUICK_SWITCH_CLOSE,
		CUJ_LAUNCHER_KEYBOARD_QUICK_SWITCH_APP_LAUNCH
		CUJ_LAUNCHER_KEYBOARD_QUICK_SWITCH_APP_LAUNCH,
		CUJ_DESKTOP_MODE_ENTER_APP_HANDLE_DRAG_RELEASE
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface CujType {}
		@@ -414,7 +428,7 @@ public class Cuj {
		CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_DESKTOP_MODE_MAXIMIZE_WINDOW] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__DESKTOP_MODE_MAXIMIZE_WINDOW;
		CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_FOLD_ANIM] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__FOLD_ANIM;
		CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_DESKTOP_MODE_RESIZE_WINDOW] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__DESKTOP_MODE_RESIZE_WINDOW;
		CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_DESKTOP_MODE_ENTER_MODE_APP_HANDLE_DRAG] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__DESKTOP_MODE_ENTER_MODE_APP_HANDLE_DRAG;
		CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_DESKTOP_MODE_ENTER_APP_HANDLE_DRAG_HOLD] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__DESKTOP_MODE_ENTER_APP_HANDLE_DRAG_HOLD;
		CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_DESKTOP_MODE_ENTER_MODE_APP_HANDLE_MENU] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__DESKTOP_MODE_ENTER_MODE_APP_HANDLE_MENU;
		CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_DESKTOP_MODE_EXIT_MODE] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__DESKTOP_MODE_EXIT_MODE;
		CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_DESKTOP_MODE_MINIMIZE_WINDOW] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__DESKTOP_MODE_MINIMIZE_WINDOW;
		@@ -423,6 +437,7 @@ public class Cuj {
		CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_LAUNCHER_KEYBOARD_QUICK_SWITCH_OPEN] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_KEYBOARD_QUICK_SWITCH_OPEN;
		CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_LAUNCHER_KEYBOARD_QUICK_SWITCH_CLOSE] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_KEYBOARD_QUICK_SWITCH_CLOSE;
		CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_LAUNCHER_KEYBOARD_QUICK_SWITCH_APP_LAUNCH] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_KEYBOARD_QUICK_SWITCH_APP_LAUNCH;
		CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_DESKTOP_MODE_ENTER_APP_HANDLE_DRAG_RELEASE] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__DESKTOP_MODE_ENTER_APP_HANDLE_DRAG_RELEASE;
		}

		private Cuj() {
		@@ -631,8 +646,8 @@ public class Cuj {
		return "FOLD_ANIM";
		case CUJ_DESKTOP_MODE_RESIZE_WINDOW:
		return "DESKTOP_MODE_RESIZE_WINDOW";
		case CUJ_DESKTOP_MODE_ENTER_MODE_APP_HANDLE_DRAG:
		return "DESKTOP_MODE_ENTER_MODE_APP_HANDLE_DRAG";
		case CUJ_DESKTOP_MODE_ENTER_APP_HANDLE_DRAG_HOLD:
		return "DESKTOP_MODE_ENTER_APP_HANDLE_DRAG_HOLD";
		case CUJ_DESKTOP_MODE_ENTER_MODE_APP_HANDLE_MENU:
		return "DESKTOP_MODE_ENTER_MODE_APP_HANDLE_MENU";
		case CUJ_DESKTOP_MODE_EXIT_MODE:
		@@ -649,6 +664,8 @@ public class Cuj {
		return "LAUNCHER_KEYBOARD_QUICK_SWITCH_CLOSE";
		case CUJ_LAUNCHER_KEYBOARD_QUICK_SWITCH_APP_LAUNCH:
		return "LAUNCHER_KEYBOARD_QUICK_SWITCH_APP_LAUNCH";
		case CUJ_DESKTOP_MODE_ENTER_APP_HANDLE_DRAG_RELEASE:
		return "DESKTOP_MODE_ENTER_APP_HANDLE_DRAG_RELEASE";
		}
		return "UNKNOWN";
		}