Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49678004 authored by Vania Desmonda's avatar Vania Desmonda
Browse files

Add verifications that functions get called on key gesture events.

Test: atest DesktopModeKeyGestureHandlerTest
Bug: 380036936
Flag: com.android.window.flags.enable_task_resizing_keyboard_shortcuts
Change-Id: If143b9854f31e881a3639485bb72c4508624b1b5
parent 7879f67a
Loading
Loading
Loading
Loading
+27 −4
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ import com.android.window.flags.Flags.FLAG_ENABLE_TASK_RESIZING_KEYBOARD_SHORTCU
import com.android.wm.shell.TestShellExecutor
import com.android.wm.shell.common.DisplayController
import com.android.wm.shell.common.DisplayLayout
import com.android.wm.shell.desktopmode.common.ToggleTaskSizeInteraction
import com.android.wm.shell.shared.desktopmode.DesktopModeStatus
import com.android.wm.shell.sysui.ShellInit
import com.android.wm.shell.windowdecor.DesktopModeWindowDecorViewModel
@@ -204,9 +205,15 @@ class DesktopModeKeyGestureHandlerTest : ShellTestCase() {
            .setModifierState(KeyEvent.META_META_ON)
            .build()
        val result = keyGestureEventHandler.handleKeyGestureEvent(event, null)
        testExecutor.flushAll()

        assertThat(result).isTrue()
        assertThat(testExecutor.callbacks.size).isEqualTo(1)
        verify(desktopModeWindowDecorViewModel).onSnapResize(
            task.taskId,
            true,
            DesktopModeEventLogger.Companion.InputMethod.KEYBOARD,
            /* fromMenu= */ false
        )
    }

    @Test
@@ -226,9 +233,15 @@ class DesktopModeKeyGestureHandlerTest : ShellTestCase() {
            .setModifierState(KeyEvent.META_META_ON)
            .build()
        val result = keyGestureEventHandler.handleKeyGestureEvent(event, null)
        testExecutor.flushAll()

        assertThat(result).isTrue()
        assertThat(testExecutor.callbacks.size).isEqualTo(1)
        verify(desktopModeWindowDecorViewModel).onSnapResize(
            task.taskId,
            false,
            DesktopModeEventLogger.Companion.InputMethod.KEYBOARD,
            /* fromMenu= */ false
        )
    }

    @Test
@@ -248,9 +261,18 @@ class DesktopModeKeyGestureHandlerTest : ShellTestCase() {
            .setModifierState(KeyEvent.META_META_ON)
            .build()
        val result = keyGestureEventHandler.handleKeyGestureEvent(event, null)
        testExecutor.flushAll()

        assertThat(result).isTrue()
        assertThat(testExecutor.callbacks.size).isEqualTo(1)
        verify(desktopTasksController).toggleDesktopTaskSize(
            task,
            ToggleTaskSizeInteraction(
                isMaximized = isTaskMaximized(task, displayController),
                source = ToggleTaskSizeInteraction.Source.KEYBOARD_SHORTCUT,
                inputMethod =
                    DesktopModeEventLogger.Companion.InputMethod.KEYBOARD,
            ),
        )
    }

    @Test
@@ -270,9 +292,10 @@ class DesktopModeKeyGestureHandlerTest : ShellTestCase() {
            .setModifierState(KeyEvent.META_META_ON)
            .build()
        val result = keyGestureEventHandler.handleKeyGestureEvent(event, null)
        testExecutor.flushAll()

        assertThat(result).isTrue()
        assertThat(testExecutor.callbacks.size).isEqualTo(1)
        verify(desktopTasksController).minimizeTask(task)
    }

    private fun setUpFreeformTask(