Merge "Also handle when wallpaper is going to back." into main (5d84b493) · Commits · e / os / android_frameworks_base

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

+7 −5

Original line number	Diff line number	Diff line
		@@ -186,14 +186,16 @@ class DesktopTasksTransitionObserver(
		for (change in info.changes) {
		val taskInfo = change.taskInfo
		if (taskInfo == null \|\| taskInfo.taskId == -1) continue
		if (change.mode != TRANSIT_CLOSE) continue

		if (minimizingTask == null) {
		minimizingTask = getMinimizingTaskForClosingTransition(taskInfo)
		if (
		TransitionUtil.isClosingMode(change.mode) &&
		DesktopWallpaperActivity.isWallpaperTask(taskInfo)
		) {
		hasWallpaperClosing = true
		}

		if (DesktopWallpaperActivity.isWallpaperTask(taskInfo)) {
		hasWallpaperClosing = true
		if (change.mode == TRANSIT_CLOSE && minimizingTask == null) {
		minimizingTask = getMinimizingTaskForClosingTransition(taskInfo)
		}
		}

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

+33 −1

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import android.content.Context
		import android.content.Intent
		import android.os.Binder
		import android.os.IBinder
		import android.platform.test.annotations.DisableFlags
		import android.platform.test.annotations.EnableFlags
		import android.view.Display.DEFAULT_DISPLAY
		import android.view.WindowManager
		@@ -168,7 +169,8 @@ class DesktopTasksTransitionObserverTest {

		@Test
		@EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION)
		fun backNavigation_withCloseTransitionLastTask_taskMinimized() {
		@DisableFlags(Flags.FLAG_ENABLE_DESKTOP_WALLPAPER_ACTIVITY_FOR_SYSTEM_USER)
		fun backNavigation_withCloseTransitionLastTask_wallpaperActivityClosed_taskMinimized() {
		val task = createTaskInfo(1)
		val transition = mock<IBinder>()
		whenever(taskRepository.getVisibleTaskCount(any())).thenReturn(1)
		@@ -192,6 +194,35 @@ class DesktopTasksTransitionObserverTest {
		verify(mixedHandler).addPendingMixedTransition(pendingTransition)
		}

		@Test
		@EnableFlags(
		Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION,
		Flags.FLAG_ENABLE_DESKTOP_WALLPAPER_ACTIVITY_FOR_SYSTEM_USER,
		)
		fun backNavigation_withCloseTransitionLastTask_wallpaperActivityReordered_taskMinimized() {
		val task = createTaskInfo(1)
		val transition = mock<IBinder>()
		whenever(taskRepository.getVisibleTaskCount(any())).thenReturn(1)
		whenever(taskRepository.isClosingTask(task.taskId)).thenReturn(false)
		whenever(backAnimationController.latestTriggerBackTask).thenReturn(task.taskId)

		transitionObserver.onTransitionReady(
		transition = transition,
		info = createBackNavigationTransition(task, TRANSIT_CLOSE, true, TRANSIT_TO_BACK),
		startTransaction = mock(),
		finishTransaction = mock(),
		)

		verify(taskRepository).minimizeTask(task.displayId, task.taskId)
		val pendingTransition =
		DesktopMixedTransitionHandler.PendingMixedTransition.Minimize(
		transition,
		task.taskId,
		isLastTask = true,
		)
		verify(mixedHandler).addPendingMixedTransition(pendingTransition)
		}

		@Test
		@EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION)
		fun backNavigation_nullTaskInfo_taskNotMinimized() {
		@@ -434,6 +465,7 @@ class DesktopTasksTransitionObserverTest {
		task: RunningTaskInfo?,
		type: Int = TRANSIT_TO_BACK,
		withWallpaper: Boolean = false,
		wallpaperChangeMode: Int = TRANSIT_CLOSE,
		): TransitionInfo {
		return TransitionInfo(type, /* flags= */ 0).apply {
		addChange(