Merge "Relax home-task assertion in end-drag-to-desktop transition" into main (264792d0) · Commits · e / os / android_frameworks_base

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

+10 −3

Original line number	Diff line number	Diff line
		@@ -959,9 +959,16 @@ constructor(
		super.setupEndDragToDesktop(info, startTransaction, finishTransaction)

		val state = requireTransitionState()
		val homeLeash = state.homeChange?.leash ?: error("Expects home leash to be non-null")
		val homeLeash = state.homeChange?.leash
		if (homeLeash == null) {
		ProtoLog.e(
		ShellProtoLogGroup.WM_SHELL_DESKTOP_MODE,
		"DragToDesktop: home leash is null",
		)
		} else {
		// Hide home on finish to prevent flickering when wallpaper activity flag is enabled
		finishTransaction.hide(homeLeash)
		}
		// Setup freeform tasks before animation
		state.freeformTaskChanges.forEach { change ->
		val startScale = FREEFORM_TASKS_INITIAL_SCALE

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DragToDesktopTransitionHandlerTest.kt

+47 −9

Original line number	Diff line number	Diff line
		@@ -476,6 +476,40 @@ class DragToDesktopTransitionHandlerTest : ShellTestCase() {
		verify(finishCallback).onTransitionFinished(null)
		}

		@Test
		fun mergeAnimation_endTransition_springHandler_noStartHomeChange_doesntCrash() {
		whenever(dragAnimator.computeCurrentVelocity()).thenReturn(PointF())
		val playingFinishTransaction = mock<SurfaceControl.Transaction>()
		val mergedStartTransaction = mock<SurfaceControl.Transaction>()
		val mergedFinishTransaction = mock<SurfaceControl.Transaction>()
		val finishCallback = mock<Transitions.TransitionFinishCallback>()
		val task = createTask()
		val startTransition = startDrag(
		springHandler, task, finishTransaction = playingFinishTransaction, homeChange = null)
		springHandler.onTaskResizeAnimationListener = mock()

		springHandler.mergeAnimation(
		transition = mock<IBinder>(),
		info =
		createTransitionInfo(
		type = TRANSIT_DESKTOP_MODE_END_DRAG_TO_DESKTOP,
		draggedTask = task,
		),
		startT = mergedStartTransaction,
		finishT = mergedFinishTransaction,
		mergeTarget = startTransition,
		finishCallback = finishCallback,
		)

		// Should show dragged task layer in start and finish transaction
		verify(mergedStartTransaction).show(draggedTaskLeash)
		verify(playingFinishTransaction).show(draggedTaskLeash)
		// Should update the dragged task layer
		verify(mergedStartTransaction).setLayer(eq(draggedTaskLeash), anyInt())
		// Should merge animation
		verify(finishCallback).onTransitionFinished(null)
		}

		@Test
		fun propertyValue_returnsSystemPropertyValue() {
		val name = "property_name"
		@@ -589,6 +623,7 @@ class DragToDesktopTransitionHandlerTest : ShellTestCase() {
		handler: DragToDesktopTransitionHandler,
		task: RunningTaskInfo = createTask(),
		finishTransaction: SurfaceControl.Transaction = mock(),
		homeChange: TransitionInfo.Change? = createHomeChange(),
		): IBinder {
		whenever(dragAnimator.position).thenReturn(PointF())
		// Simulate transition is started and is ready to animate.
		@@ -599,6 +634,7 @@ class DragToDesktopTransitionHandlerTest : ShellTestCase() {
		createTransitionInfo(
		type = TRANSIT_DESKTOP_MODE_START_DRAG_TO_DESKTOP,
		draggedTask = task,
		homeChange = homeChange,
		),
		startTransaction = mock(),
		finishTransaction = finishTransaction,
		@@ -684,16 +720,12 @@ class DragToDesktopTransitionHandlerTest : ShellTestCase() {
		}
		}

		private fun createTransitionInfo(type: Int, draggedTask: RunningTaskInfo) =
		private fun createTransitionInfo(
		type: Int,
		draggedTask: RunningTaskInfo,
		homeChange: TransitionInfo.Change? = createHomeChange()) =
		TransitionInfo(type, /* flags= */ 0).apply {
		addChange( // Home.
		TransitionInfo.Change(mock(), homeTaskLeash).apply {
		parent = null
		taskInfo =
		TestRunningTaskInfoBuilder().setActivityType(ACTIVITY_TYPE_HOME).build()
		flags = flags or FLAG_IS_WALLPAPER
		}
		)
		homeChange?.let { addChange(it) }
		addChange( // Dragged Task.
		TransitionInfo.Change(mock(), draggedTaskLeash).apply {
		parent = null
		@@ -709,6 +741,12 @@ class DragToDesktopTransitionHandlerTest : ShellTestCase() {
		)
		}

		private fun createHomeChange() = TransitionInfo.Change(mock(), homeTaskLeash).apply {
		parent = null
		taskInfo = TestRunningTaskInfoBuilder().setActivityType(ACTIVITY_TYPE_HOME).build()
		flags = flags or FLAG_IS_WALLPAPER
		}

		private fun systemPropertiesKey(name: String) =
		"${SpringDragToDesktopTransitionHandler.SYSTEM_PROPERTIES_GROUP}.$name"
		}