Merge "[3/n] Rename APP_FROM_OVERVIEW to OVERVIEW_TASK_MENU" into main (9bbd4b7d) · Commits · e / os / android_frameworks_base

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -25,8 +25,8 @@ enum class DesktopModeTransitionSource : Parcelable {
		ADB_COMMAND,
		/** Transitions that originated as a consequence of task dragging. */
		TASK_DRAG,
		/** Transitions that originated from an app from Overview. */
		APP_FROM_OVERVIEW,
		/** Transitions that originated from overview task menu. */
		OVERVIEW_TASK_MENU,
		/** Transitions that originated from app handle menu button */
		APP_HANDLE_MENU_BUTTON,
		/** Transitions that originated as a result of keyboard shortcuts. */

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -548,8 +548,8 @@ class DesktopModeEventLogger {
		FrameworkStatsLog.DESKTOP_MODE_UICHANGED__ENTER_REASON__KEYBOARD_SHORTCUT_ENTER
		),
		SCREEN_ON(FrameworkStatsLog.DESKTOP_MODE_UICHANGED__ENTER_REASON__SCREEN_ON),
		APP_FROM_OVERVIEW(
		FrameworkStatsLog.DESKTOP_MODE_UICHANGED__ENTER_REASON__APP_FROM_OVERVIEW
		OVERVIEW_TASK_MENU(
		FrameworkStatsLog.DESKTOP_MODE_UICHANGED__ENTER_REASON__OVERVIEW_TASK_MENU
		),
		}

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -46,9 +46,9 @@ import com.android.wm.shell.desktopmode.DesktopModeEventLogger.Companion.TaskUpd
		import com.android.wm.shell.desktopmode.DesktopModeEventLogger.Companion.UnminimizeReason
		import com.android.wm.shell.desktopmode.DesktopModeTransitionTypes.TRANSIT_DESKTOP_MODE_END_DRAG_TO_DESKTOP
		import com.android.wm.shell.desktopmode.DesktopModeTransitionTypes.TRANSIT_DESKTOP_MODE_TASK_LIMIT_MINIMIZE
		import com.android.wm.shell.desktopmode.DesktopModeTransitionTypes.TRANSIT_ENTER_DESKTOP_FROM_APP_FROM_OVERVIEW
		import com.android.wm.shell.desktopmode.DesktopModeTransitionTypes.TRANSIT_ENTER_DESKTOP_FROM_APP_HANDLE_MENU_BUTTON
		import com.android.wm.shell.desktopmode.DesktopModeTransitionTypes.TRANSIT_ENTER_DESKTOP_FROM_KEYBOARD_SHORTCUT
		import com.android.wm.shell.desktopmode.DesktopModeTransitionTypes.TRANSIT_ENTER_DESKTOP_FROM_OVERVIEW_TASK_MENU
		import com.android.wm.shell.desktopmode.DesktopModeTransitionTypes.TRANSIT_EXIT_DESKTOP_MODE_HANDLE_MENU_BUTTON
		import com.android.wm.shell.desktopmode.DesktopModeTransitionTypes.TRANSIT_EXIT_DESKTOP_MODE_KEYBOARD_SHORTCUT
		import com.android.wm.shell.desktopmode.DesktopModeTransitionTypes.TRANSIT_EXIT_DESKTOP_MODE_TASK_DRAG
		@@ -483,8 +483,8 @@ class DesktopModeLoggerTransitionObserver(
		EnterReason.APP_HANDLE_DRAG
		transitionInfo?.type == TRANSIT_ENTER_DESKTOP_FROM_APP_HANDLE_MENU_BUTTON ->
		EnterReason.APP_HANDLE_MENU_BUTTON
		transitionInfo?.type == TRANSIT_ENTER_DESKTOP_FROM_APP_FROM_OVERVIEW ->
		EnterReason.APP_FROM_OVERVIEW
		transitionInfo?.type == TRANSIT_ENTER_DESKTOP_FROM_OVERVIEW_TASK_MENU ->
		EnterReason.OVERVIEW_TASK_MENU
		transitionInfo?.type == TRANSIT_ENTER_DESKTOP_FROM_KEYBOARD_SHORTCUT ->
		EnterReason.KEYBOARD_SHORTCUT_ENTER
		// NOTE: the below condition also applies for EnterReason quickswitch

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -27,7 +27,7 @@ import com.android.wm.shell.transition.Transitions.TRANSIT_DESKTOP_MODE_TYPES
		object DesktopModeTransitionTypes {

		const val TRANSIT_ENTER_DESKTOP_FROM_APP_HANDLE_MENU_BUTTON = TRANSIT_DESKTOP_MODE_TYPES + 1
		const val TRANSIT_ENTER_DESKTOP_FROM_APP_FROM_OVERVIEW = TRANSIT_DESKTOP_MODE_TYPES + 2
		const val TRANSIT_ENTER_DESKTOP_FROM_OVERVIEW_TASK_MENU = TRANSIT_DESKTOP_MODE_TYPES + 2
		const val TRANSIT_ENTER_DESKTOP_FROM_KEYBOARD_SHORTCUT = TRANSIT_DESKTOP_MODE_TYPES + 3
		const val TRANSIT_ENTER_DESKTOP_FROM_UNKNOWN = TRANSIT_DESKTOP_MODE_TYPES + 4
		const val TRANSIT_EXIT_DESKTOP_MODE_TASK_DRAG = TRANSIT_DESKTOP_MODE_TYPES + 5
		@@ -56,7 +56,7 @@ object DesktopModeTransitionTypes {
		return this in
		listOf(
		TRANSIT_ENTER_DESKTOP_FROM_APP_HANDLE_MENU_BUTTON,
		TRANSIT_ENTER_DESKTOP_FROM_APP_FROM_OVERVIEW,
		TRANSIT_ENTER_DESKTOP_FROM_OVERVIEW_TASK_MENU,
		TRANSIT_ENTER_DESKTOP_FROM_KEYBOARD_SHORTCUT,
		TRANSIT_ENTER_DESKTOP_FROM_UNKNOWN,
		)
		@@ -72,8 +72,8 @@ object DesktopModeTransitionTypes {
		return when (this) {
		DesktopModeTransitionSource.APP_HANDLE_MENU_BUTTON ->
		TRANSIT_ENTER_DESKTOP_FROM_APP_HANDLE_MENU_BUTTON
		DesktopModeTransitionSource.APP_FROM_OVERVIEW ->
		TRANSIT_ENTER_DESKTOP_FROM_APP_FROM_OVERVIEW
		DesktopModeTransitionSource.OVERVIEW_TASK_MENU ->
		TRANSIT_ENTER_DESKTOP_FROM_OVERVIEW_TASK_MENU
		DesktopModeTransitionSource.KEYBOARD_SHORTCUT ->
		TRANSIT_ENTER_DESKTOP_FROM_KEYBOARD_SHORTCUT
		else -> TRANSIT_ENTER_DESKTOP_FROM_UNKNOWN

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -1026,7 +1026,7 @@ class DesktopTasksController(
		DesktopExperienceFlags.ENABLE_PROJECTED_DISPLAY_DESKTOP_MODE.isTrue &&
		!desktopState.isDesktopModeSupportedOnDisplay(displayId) &&
		transitionSource != DesktopModeTransitionSource.ADB_COMMAND &&
		transitionSource != DesktopModeTransitionSource.APP_FROM_OVERVIEW
		transitionSource != DesktopModeTransitionSource.OVERVIEW_TASK_MENU
		) {
		logW("moveTaskToDefaultDeskAndActivate display=$displayId does not support desk")
		return false