Merge "Rename split select callback." into main (b224cb04) · Commits · e / os / android_frameworks_base

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

+5 −6

Original line number	Diff line number	Diff line
		@@ -1516,7 +1516,7 @@ class DesktopTasksController(
		*
		* @param taskInfo task entering split that requires a bounds update
		*/
		fun onDesktopSplitSelectAnimComplete(taskInfo: RunningTaskInfo) {
		fun onDesktopSplitSelectChoice(taskInfo: RunningTaskInfo) {
		val wct = WindowContainerTransaction()
		wct.setBounds(taskInfo.token, Rect())
		if (!DesktopModeFlags.ENABLE_INPUT_LAYER_TRANSITION_FIX.isTrue) {
		@@ -4609,7 +4609,7 @@ class DesktopTasksController(

		/**
		* Adds split screen changes to a transaction. Note that bounds are not reset here due to
		* animation; see {@link onDesktopSplitSelectAnimComplete}
		* animation; see {@link onDesktopSplitSelectChoice}
		*/
		private fun addMoveToSplitChanges(wct: WindowContainerTransaction, taskInfo: RunningTaskInfo) {
		if (!DesktopModeFlags.ENABLE_INPUT_LAYER_TRANSITION_FIX.isTrue) {
		@@ -6229,10 +6229,9 @@ class DesktopTasksController(
		)
		}

		override fun onDesktopSplitSelectAnimComplete(taskInfo: RunningTaskInfo) {
		executeRemoteCallWithTaskPermission(controller, "onDesktopSplitSelectAnimComplete") { c
		->
		c.onDesktopSplitSelectAnimComplete(taskInfo)
		override fun onDesktopSplitSelectChoice(taskInfo: RunningTaskInfo) {
		executeRemoteCallWithTaskPermission(controller, "onDesktopSplitSelectChoice") { c ->
		c.onDesktopSplitSelectChoice(taskInfo)
		}
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -81,8 +81,8 @@ interface IDesktopMode {
		oneway void moveToFullscreen(int taskId, in DesktopModeTransitionSource transitionSource,
		in @nullable RemoteTransition remoteTransition);

		/** Perform cleanup transactions after the animation to split select is complete */
		oneway void onDesktopSplitSelectAnimComplete(in RunningTaskInfo taskInfo);
		/** Perform cleanup transactions after choosing a split select task launch option. */
		oneway void onDesktopSplitSelectChoice(in RunningTaskInfo taskInfo);

		/** Set listener that will receive callbacks about updates to desktop tasks */
		oneway void setTaskListener(IDesktopTaskListener listener);