Merge "Move desktop mode transition types from Transitions to DesktopModeTransitionTypes" into main (1c35c343) · Commits · e / os / android_frameworks_base

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -40,6 +40,7 @@ import com.android.wm.shell.desktopmode.DesktopModeEventLogger.Companion.EnterRe
		import com.android.wm.shell.desktopmode.DesktopModeEventLogger.Companion.ExitReason
		import com.android.wm.shell.desktopmode.DesktopModeEventLogger.Companion.MinimizeReason
		import com.android.wm.shell.desktopmode.DesktopModeEventLogger.Companion.TaskUpdate
		import com.android.wm.shell.desktopmode.DesktopModeTransitionTypes.TRANSIT_DESKTOP_MODE_END_DRAG_TO_DESKTOP
		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
		@@ -363,7 +364,7 @@ class DesktopModeLoggerTransitionObserver(
		\|\|
		(transitionInfo.type == WindowManager.TRANSIT_TO_BACK &&
		wasPreviousTransitionExitByScreenOff) -> EnterReason.SCREEN_ON
		transitionInfo.type == Transitions.TRANSIT_DESKTOP_MODE_END_DRAG_TO_DESKTOP ->
		transitionInfo.type == TRANSIT_DESKTOP_MODE_END_DRAG_TO_DESKTOP ->
		EnterReason.APP_HANDLE_DRAG
		transitionInfo.type == TRANSIT_ENTER_DESKTOP_FROM_APP_HANDLE_MENU_BUTTON ->
		EnterReason.APP_HANDLE_MENU_BUTTON

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

+26 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,18 @@ object DesktopModeTransitionTypes {
		const val TRANSIT_EXIT_DESKTOP_MODE_KEYBOARD_SHORTCUT = TRANSIT_DESKTOP_MODE_TYPES + 7
		const val TRANSIT_EXIT_DESKTOP_MODE_UNKNOWN = TRANSIT_DESKTOP_MODE_TYPES + 8

		/** Transition type for starting the drag to desktop mode. */
		const val TRANSIT_DESKTOP_MODE_START_DRAG_TO_DESKTOP = TRANSIT_DESKTOP_MODE_TYPES + 9

		/** Transition type for finalizing the drag to desktop mode. */
		const val TRANSIT_DESKTOP_MODE_END_DRAG_TO_DESKTOP = TRANSIT_DESKTOP_MODE_TYPES + 10

		/** Transition type to cancel the drag to desktop mode. */
		const val TRANSIT_DESKTOP_MODE_CANCEL_DRAG_TO_DESKTOP = TRANSIT_DESKTOP_MODE_TYPES + 11

		/** Transition type to animate the toggle resize between the max and default desktop sizes. */
		const val TRANSIT_DESKTOP_MODE_TOGGLE_RESIZE = TRANSIT_DESKTOP_MODE_TYPES + 12

		/** Return whether the [TransitionType] corresponds to a transition to enter desktop mode. */
		@JvmStatic
		fun @receiver:TransitionType Int.isEnterDesktopModeTransition(): Boolean {
		@@ -92,4 +104,18 @@ object DesktopModeTransitionTypes {
		else -> TRANSIT_EXIT_DESKTOP_MODE_UNKNOWN
		}
		}

		/**
		* Returns a string representing the [TransitionType]. If not supported, returns an empty
		* string.
		*/
		@JvmStatic
		fun transitTypeToString(transitType: Int): String =
		when (transitType) {
		TRANSIT_DESKTOP_MODE_START_DRAG_TO_DESKTOP -> "DESKTOP_MODE_START_DRAG_TO_DESKTOP"
		TRANSIT_DESKTOP_MODE_END_DRAG_TO_DESKTOP -> "DESKTOP_MODE_END_DRAG_TO_DESKTOP"
		TRANSIT_DESKTOP_MODE_CANCEL_DRAG_TO_DESKTOP -> "DESKTOP_MODE_CANCEL_DRAG_TO_DESKTOP"
		TRANSIT_DESKTOP_MODE_TOGGLE_RESIZE -> "DESKTOP_MODE_TOGGLE_RESIZE"
		else -> ""
		}
		}

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -37,6 +37,9 @@ import com.android.internal.jank.InteractionJankMonitor
		import com.android.internal.protolog.ProtoLog
		import com.android.wm.shell.RootTaskDisplayAreaOrganizer
		import com.android.wm.shell.animation.FloatProperties
		import com.android.wm.shell.desktopmode.DesktopModeTransitionTypes.TRANSIT_DESKTOP_MODE_CANCEL_DRAG_TO_DESKTOP
		import com.android.wm.shell.desktopmode.DesktopModeTransitionTypes.TRANSIT_DESKTOP_MODE_END_DRAG_TO_DESKTOP
		import com.android.wm.shell.desktopmode.DesktopModeTransitionTypes.TRANSIT_DESKTOP_MODE_START_DRAG_TO_DESKTOP
		import com.android.wm.shell.protolog.ShellProtoLogGroup
		import com.android.wm.shell.shared.TransitionUtil
		import com.android.wm.shell.shared.animation.PhysicsAnimator
		@@ -46,9 +49,6 @@ import com.android.wm.shell.shared.split.SplitScreenConstants.SPLIT_POSITION_UND
		import com.android.wm.shell.shared.split.SplitScreenConstants.SplitPosition
		import com.android.wm.shell.splitscreen.SplitScreenController
		import com.android.wm.shell.transition.Transitions
		import com.android.wm.shell.transition.Transitions.TRANSIT_DESKTOP_MODE_CANCEL_DRAG_TO_DESKTOP
		import com.android.wm.shell.transition.Transitions.TRANSIT_DESKTOP_MODE_END_DRAG_TO_DESKTOP
		import com.android.wm.shell.transition.Transitions.TRANSIT_DESKTOP_MODE_START_DRAG_TO_DESKTOP
		import com.android.wm.shell.transition.Transitions.TransitionHandler
		import com.android.wm.shell.windowdecor.MoveToDesktopAnimator
		import com.android.wm.shell.windowdecor.MoveToDesktopAnimator.Companion.DRAG_FREEFORM_SCALE

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -30,8 +30,8 @@ import android.window.WindowContainerTransaction
		import androidx.core.animation.addListener
		import com.android.internal.jank.Cuj
		import com.android.internal.jank.InteractionJankMonitor
		import com.android.wm.shell.desktopmode.DesktopModeTransitionTypes.TRANSIT_DESKTOP_MODE_TOGGLE_RESIZE
		import com.android.wm.shell.transition.Transitions
		import com.android.wm.shell.transition.Transitions.TRANSIT_DESKTOP_MODE_TOGGLE_RESIZE
		import com.android.wm.shell.windowdecor.OnTaskResizeAnimationListener
		import java.util.function.Supplier

libs/WindowManager/Shell/src/com/android/wm/shell/transition/HomeTransitionObserver.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@ import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME;
		import static android.view.Display.DEFAULT_DISPLAY;
		import static android.window.TransitionInfo.FLAG_BACK_GESTURE_ANIMATED;

		import static com.android.wm.shell.transition.Transitions.TRANSIT_DESKTOP_MODE_START_DRAG_TO_DESKTOP;
		import static com.android.wm.shell.desktopmode.DesktopModeTransitionTypes.TRANSIT_DESKTOP_MODE_START_DRAG_TO_DESKTOP;
		import static com.android.wm.shell.transition.Transitions.TransitionObserver;

		import android.annotation.NonNull;