Merge "[2/n] Log desktop entry reasons from Launcher" into main (7d9ada1c) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/desktopmode/DesktopModeTransitionSource.kt

+2 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,8 @@ enum class DesktopModeTransitionSource : Parcelable {
		APP_HANDLE_MENU_BUTTON,
		/** Transitions that originated as a result of keyboard shortcuts. */
		KEYBOARD_SHORTCUT,
		/** Transitions that originated from Recents. */
		RECENTS,
		/** Transitions with source unknown. */
		UNKNOWN;

+3 −0

Original line number	Diff line number	Diff line
		@@ -4203,6 +4203,7 @@ class DesktopTasksController(
		deskId: Int,
		remoteTransition: RemoteTransition? = null,
		taskIdToReorderToFront: Int? = null,
		transitionSource: DesktopModeTransitionSource = DesktopModeTransitionSource.UNKNOWN,
		) =
		traceSection(
		Trace.TRACE_TAG_WINDOW_MANAGER,
		@@ -5326,12 +5327,14 @@ class DesktopTasksController(
		deskId: Int,
		remoteTransition: RemoteTransition?,
		taskIdInFront: Int,
		transitionSource: DesktopModeTransitionSource,
		) {
		executeRemoteCallWithTaskPermission(controller, "activateDesk") { c ->
		c.activateDesk(
		deskId,
		remoteTransition,
		if (taskIdInFront != INVALID_TASK_ID) taskIdInFront else null,
		transitionSource,
		)
		}
		}

+2 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,8 @@ interface IDesktopMode {
		* If [taskIdToReorderToFront] is a valid id (not [INVALID_TASK_ID]) and is already on the given
		* desk, bring it to the front.
		*/
		oneway void activateDesk(int deskId, in RemoteTransition remoteTransition, int taskIdToReorderToFront);
		oneway void activateDesk(int deskId, in RemoteTransition remoteTransition,
		int taskIdToReorderToFront, in DesktopModeTransitionSource transitionSource);

		/** Removes the desk with the given `deskId`. */
		oneway void removeDesk(int deskId);