Merge "Add support to tiling display disconnect." into main (a773ab40) · Commits · e / os / android_frameworks_base

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

+6 −1

Original line number	Original line	Diff line number	Diff line
	@@ -660,11 +660,14 @@ class DesktopTasksController(
	val wct = WindowContainerTransaction()		val wct = WindowContainerTransaction()
	// TODO: b/391652399 - Investigate why sometimes disconnect results in a black background.		// TODO: b/391652399 - Investigate why sometimes disconnect results in a black background.
	// Additionally, investigate why wallpaper goes to front for inactive users.		// Additionally, investigate why wallpaper goes to front for inactive users.
			val desktopModeSupportedOnDisplay =
			desktopState.isDesktopModeSupportedOnDisplay(destinationDisplayId)
			snapEventHandler.onDisplayDisconnected(disconnectedDisplayId, desktopModeSupportedOnDisplay)
	removeWallpaperTask(wct, disconnectedDisplayId)		removeWallpaperTask(wct, disconnectedDisplayId)
	removeHomeTask(wct, disconnectedDisplayId)		removeHomeTask(wct, disconnectedDisplayId)
	userRepositories.forAllRepositories { desktopRepository ->		userRepositories.forAllRepositories { desktopRepository ->
	val deskIds = desktopRepository.getDeskIds(disconnectedDisplayId).toList()		val deskIds = desktopRepository.getDeskIds(disconnectedDisplayId).toList()
	if (desktopState.isDesktopModeSupportedOnDisplay(destinationDisplayId)) {		if (desktopModeSupportedOnDisplay) {
	// Desktop supported on display; reparent desks, focused desk on top.		// Desktop supported on display; reparent desks, focused desk on top.
	for (deskId in deskIds) {		for (deskId in deskIds) {
	val toTop =		val toTop =
	@@ -3651,12 +3654,14 @@ class DesktopTasksController(
	displayId = displayId,		displayId = displayId,
	deskId = deskId,		deskId = deskId,
	enterTaskId = newTaskIdInFront,		enterTaskId = newTaskIdInFront,
			runOnTransitEnd = { snapEventHandler.onDeskActivated(deskId, displayId) },
	)		)
	} else {		} else {
	DeskTransition.ActivateDesk(		DeskTransition.ActivateDesk(
	token = transition,		token = transition,
	displayId = displayId,		displayId = displayId,
	deskId = deskId,		deskId = deskId,
			runOnTransitEnd = { snapEventHandler.onDeskActivated(deskId, displayId) },
	)		)
	}		}
	desksTransitionObserver.addPendingTransition(activateDeskTransition)		desksTransitionObserver.addPendingTransition(activateDeskTransition)

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

+31 −6

Original line number	Original line	Diff line number	Diff line
	@@ -39,6 +39,17 @@ sealed interface DeskTransition {
	/** A transition to activate a desk in its display. */		/** A transition to activate a desk in its display. */
	data class ActivateDesk(override val token: IBinder, val displayId: Int, val deskId: Int) :		data class ActivateDesk(override val token: IBinder, val displayId: Int, val deskId: Int) :
	DeskTransition {		DeskTransition {
			constructor(
			token: IBinder,
			displayId: Int,
			deskId: Int,
			runOnTransitEnd: (() -> Unit)?,
			) : this(token, displayId, deskId) {
			this.runOnTransitEnd = runOnTransitEnd
			}

			var runOnTransitEnd: (() -> Unit)? = null

	override fun copyWithToken(token: IBinder): DeskTransition = copy(token)		override fun copyWithToken(token: IBinder): DeskTransition = copy(token)
	}		}

	@@ -49,19 +60,33 @@ sealed interface DeskTransition {
	val deskId: Int,		val deskId: Int,
	val enterTaskId: Int,		val enterTaskId: Int,
	) : DeskTransition {		) : DeskTransition {
			constructor(
			token: IBinder,
			displayId: Int,
			deskId: Int,
			enterTaskId: Int,
			runOnTransitEnd: (() -> Unit)?,
			) : this(token, displayId, deskId, enterTaskId) {
			this.runOnTransitEnd = runOnTransitEnd
			}

			var runOnTransitEnd: (() -> Unit)? = null

	override fun copyWithToken(token: IBinder): DeskTransition = copy(token)		override fun copyWithToken(token: IBinder): DeskTransition = copy(token)
	}		}

	/** A transition to deactivate a desk. */		/** A transition to deactivate a desk. */
	data class DeactivateDesk(		data class DeactivateDesk(override val token: IBinder, val deskId: Int) : DeskTransition {
	override val token: IBinder,		constructor(
	val deskId: Int,		token: IBinder,
	) : DeskTransition {		deskId: Int,
	constructor(token: IBinder, deskId: Int, runOnTransitEnd: (() -> Unit)?)		runOnTransitEnd: (() -> Unit)?,
	: this(token, deskId) {		) : this(token, deskId) {
	this.runOnTransitEnd = runOnTransitEnd		this.runOnTransitEnd = runOnTransitEnd
	}		}

	var runOnTransitEnd: (() -> Unit)? = null		var runOnTransitEnd: (() -> Unit)? = null

	override fun copyWithToken(token: IBinder): DeskTransition = copy(token)		override fun copyWithToken(token: IBinder): DeskTransition = copy(token)
	}		}

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

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -120,6 +120,7 @@ class DesksTransitionObserver(
	displayId = deskTransition.displayId,		displayId = deskTransition.displayId,
	deskId = deskTransition.deskId,		deskId = deskTransition.deskId,
	)		)
			deskTransition.runOnTransitEnd?.invoke()
	}		}
	is DeskTransition.ActivateDeskWithTask -> {		is DeskTransition.ActivateDeskWithTask -> {
	val deskId = deskTransition.deskId		val deskId = deskTransition.deskId
	@@ -157,6 +158,7 @@ class DesksTransitionObserver(
	} else {		} else {
	logW("ActivateDeskWithTask: did not find task change")		logW("ActivateDeskWithTask: did not find task change")
	}		}
			deskTransition.runOnTransitEnd?.invoke()
	}		}
	is DeskTransition.DeactivateDesk -> handleDeactivateDeskTransition(info, deskTransition)		is DeskTransition.DeactivateDesk -> handleDeactivateDeskTransition(info, deskTransition)
	is DeskTransition.ChangeDeskDisplay -> handleChangeDeskDisplay(info, deskTransition)		is DeskTransition.ChangeDeskDisplay -> handleChangeDeskDisplay(info, deskTransition)

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java

+31 −0

Original line number	Original line	Diff line number	Diff line
	@@ -970,6 +970,30 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel,
	currentDragBounds);		currentDragBounds);
	}		}

			@Override
			public void onDeskActivated(int deskId, int displayId) {
			if (!mDesktopTilingDecorViewModel.onDeskActivated(deskId)) {
			return;
			}

			final DesktopRepository repository = mDesktopUserRepositories.getCurrent();
			final Integer leftTaskId = repository.getLeftTiledTask(deskId);
			final Integer rightTaskId = repository.getRightTiledTask(deskId);
			if (leftTaskId != null) {
			final DesktopModeWindowDecoration decor = mWindowDecorByTaskId.get(leftTaskId);
			final RunningTaskInfo taskInfo = decor.mTaskInfo;
			final Rect currentBounds = taskInfo.configuration.windowConfiguration.getBounds();
			snapPersistedTaskToHalfScreen(taskInfo, currentBounds, SnapPosition.LEFT);
			}

			if (rightTaskId != null) {
			final DesktopModeWindowDecoration decor = mWindowDecorByTaskId.get(rightTaskId);
			final RunningTaskInfo taskInfo = decor.mTaskInfo;
			final Rect currentBounds = taskInfo.configuration.windowConfiguration.getBounds();
			snapPersistedTaskToHalfScreen(taskInfo, currentBounds, SnapPosition.RIGHT);
			}
			}

	@Override		@Override
	public void removeTaskIfTiled(int displayId, int taskId) {		public void removeTaskIfTiled(int displayId, int taskId) {
	mDesktopTilingDecorViewModel.removeTaskIfTiled(displayId, taskId);		mDesktopTilingDecorViewModel.removeTaskIfTiled(displayId, taskId);
	@@ -1008,6 +1032,13 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel,
	mDesktopTilingDecorViewModel.onDeskDeactivated(deskId);		mDesktopTilingDecorViewModel.onDeskDeactivated(deskId);
	}		}

			@Override
			public void onDisplayDisconnected(int disconnectedDisplayId,
			boolean desktopModeSupportedOnNewDisplay) {
			mDesktopTilingDecorViewModel.onDisplayDisconnected(disconnectedDisplayId,
			desktopModeSupportedOnNewDisplay);
			}

	private class DesktopModeTouchEventListener extends GestureDetector.SimpleOnGestureListener		private class DesktopModeTouchEventListener extends GestureDetector.SimpleOnGestureListener
	implements View.OnClickListener, View.OnTouchListener, View.OnLongClickListener,		implements View.OnClickListener, View.OnTouchListener, View.OnLongClickListener,
	View.OnGenericMotionListener, DragDetector.MotionEventHandler {		View.OnGenericMotionListener, DragDetector.MotionEventHandler {

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/tiling/DesktopTilingDecorViewModel.kt

+36 −0

Original line number	Original line	Diff line number	Diff line
	@@ -20,10 +20,12 @@ import android.app.ActivityManager
	import android.app.ActivityManager.RunningTaskInfo		import android.app.ActivityManager.RunningTaskInfo
	import android.content.Context		import android.content.Context
	import android.graphics.Rect		import android.graphics.Rect
			import android.util.ArraySet
	import android.util.SparseArray		import android.util.SparseArray
	import android.window.DisplayAreaInfo		import android.window.DisplayAreaInfo
	import android.window.WindowContainerTransaction		import android.window.WindowContainerTransaction
	import androidx.core.util.getOrElse		import androidx.core.util.getOrElse
			import androidx.core.util.keyIterator
	import androidx.core.util.valueIterator		import androidx.core.util.valueIterator
	import com.android.internal.annotations.VisibleForTesting		import com.android.internal.annotations.VisibleForTesting
	import com.android.internal.protolog.ProtoLog		import com.android.internal.protolog.ProtoLog
	@@ -75,6 +77,7 @@ class DesktopTilingDecorViewModel(
	@VisibleForTesting		@VisibleForTesting
	var tilingHandlerByUserAndDeskId = SparseArray<SparseArray<DesktopTilingWindowDecoration>>()		var tilingHandlerByUserAndDeskId = SparseArray<SparseArray<DesktopTilingWindowDecoration>>()
	var currentUserId: Int = -1		var currentUserId: Int = -1
			val disconnectedDisplayDesks = ArraySet<Int>()

	init {		init {
	// TODO(b/374309287): Move this interface implementation to		// TODO(b/374309287): Move this interface implementation to
	@@ -180,6 +183,36 @@ class DesktopTilingDecorViewModel(
	// Exit if the rotation hasn't changed or is changed by 180 degrees. [fromRotation] and		// Exit if the rotation hasn't changed or is changed by 180 degrees. [fromRotation] and
	// [toRotation] can be one of the [@Surface.Rotation] values.		// [toRotation] can be one of the [@Surface.Rotation] values.
	if ((fromRotation % 2 == toRotation % 2)) return		if ((fromRotation % 2 == toRotation % 2)) return
			resetAllDesksWithDisplayId(displayId)
			}

			/**
			* Resets tiling sessions for all desks on the disconnected display and retains tiling data if
			* the destination display supports desktop mode, otherwise erases all tiling data.
			*/
			fun onDisplayDisconnected(
			disconnectedDisplayId: Int,
			desktopModeSupportedOnNewDisplay: Boolean,
			) {
			if (!desktopModeSupportedOnNewDisplay) {
			resetAllDesksWithDisplayId(disconnectedDisplayId)
			return
			}
			// Reset the tiling session but keep the persistence data for when the moved desks
			// are activated again.
			for (userHandlerList in tilingHandlerByUserAndDeskId.valueIterator()) {
			for (desk in userHandlerList.keyIterator()) {
			val handler = userHandlerList[desk]
			if (disconnectedDisplayId == handler.displayId) {
			handler.resetTilingSession(shouldPersistTilingData = true)
			userHandlerList.remove(desk)
			disconnectedDisplayDesks.add(desk)
			}
			}
			}
			}

			private fun resetAllDesksWithDisplayId(displayId: Int) {
	for (userHandlerList in tilingHandlerByUserAndDeskId.valueIterator()) {		for (userHandlerList in tilingHandlerByUserAndDeskId.valueIterator()) {
	for (handler in userHandlerList.valueIterator()) {		for (handler in userHandlerList.valueIterator()) {
	if (displayId == handler.displayId) {		if (displayId == handler.displayId) {
	@@ -251,6 +284,9 @@ class DesktopTilingDecorViewModel(
	tilingHandlerByUserAndDeskId[currentUserId]?.get(deskId)?.hideDividerBar()		tilingHandlerByUserAndDeskId[currentUserId]?.get(deskId)?.hideDividerBar()
	}		}

			/** Removes [deskId] from the previously deactivated desks to mark it's activation. */
			fun onDeskActivated(deskId: Int): Boolean = disconnectedDisplayDesks.remove(deskId)

	fun getCurrentActiveDeskForDisplay(displayId: Int): Int? =		fun getCurrentActiveDeskForDisplay(displayId: Int): Int? =
	desktopUserRepositories.current.getActiveDeskId(displayId)		desktopUserRepositories.current.getActiveDeskId(displayId)