Merge "Exit tiling on entering immersive mode." into main (5e9e4123) · Commits · e / os / android_frameworks_base

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -779,6 +779,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel,
		} else {
		mDesktopModeUiEventLogger.log(decoration.mTaskInfo,
		DesktopUiEventEnum.DESKTOP_WINDOW_MAXIMIZE_BUTTON_MENU_TAP_TO_IMMERSIVE);
		removeTaskIfTiled(decoration.mTaskInfo.displayId, decoration.mTaskInfo.taskId);
		mDesktopImmersiveController.moveTaskToImmersive(decoration.mTaskInfo);
		}
		decoration.closeMaximizeMenu();

+18 −0

Original line number	Diff line number	Diff line
		@@ -1141,6 +1141,24 @@ class DesktopModeWindowDecorViewModelTests : DesktopModeWindowDecorViewModelTest
		verify(mockDesktopImmersiveController).moveTaskToImmersive(decor.mTaskInfo)
		}

		@Test
		@EnableFlags(Flags.FLAG_ENABLE_FULLY_IMMERSIVE_IN_DESKTOP)
		fun testImmersiveMenuOptionClick_exitsTiling() {
		val onImmersiveClickCaptor = argumentCaptor<() -> Unit>()
		val decor = createOpenTaskDecoration(
		windowingMode = WINDOWING_MODE_FREEFORM,
		onImmersiveOrRestoreListenerCaptor = onImmersiveClickCaptor,
		requestingImmersive = true,
		)
		whenever(mockDesktopRepository.isTaskInFullImmersiveState(decor.mTaskInfo.taskId))
		.thenReturn(false)

		onImmersiveClickCaptor.firstValue()

		verify(mockTilingWindowDecoration)
		.removeTaskIfTiled(decor.mTaskInfo.displayId, decor.mTaskInfo.taskId)
		}

		@Test
		@EnableFlags(Flags.FLAG_ENABLE_FULLY_IMMERSIVE_IN_DESKTOP)
		fun testImmersiveClick_closesMaximizeMenu() {