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

Commit 0e1a06b5 authored by Vania Desmonda's avatar Vania Desmonda
Browse files

Add enable task resizing keyboard shortcuts flag to dev option. 

Bug: 335819608
Flag: com.android.window.flags.enable_task_resizing_keyboard_shortcuts
Test: presubmit
Change-Id: I01d2ee3f232333a7e5791211a06c43575f7d9d82
parent 42ab4cbd

core/java/android/window/DesktopModeFlags.java

+2 −1
Original line number Diff line number Diff line
@@ -95,7 +95,8 @@ public enum DesktopModeFlags { 
    INCLUDE_TOP_TRANSPARENT_FULLSCREEN_TASK_IN_DESKTOP_HEURISTIC(

            Flags::includeTopTransparentFullscreenTaskInDesktopHeuristic, true),

    ENABLE_MINIMIZE_BUTTON(Flags::enableMinimizeButton, true),

    ENABLE_RESIZING_METRICS(Flags::enableResizingMetrics, true);

    ENABLE_RESIZING_METRICS(Flags::enableResizingMetrics, true),

    ENABLE_TASK_RESIZING_KEYBOARD_SHORTCUTS(Flags::enableTaskResizingKeyboardShortcuts, true);



    /**

     * Flag class, to be used in case the enum cannot be used because the flag is not accessible.

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java

+2 −1
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import android.os.UserManager; 
import android.view.Choreographer;

import android.view.IWindowManager;

import android.view.WindowManager;

import android.window.DesktopModeFlags;



import androidx.annotation.OptIn;
@@ -929,7 +930,7 @@ public abstract class WMShellModule { 
        if (DesktopModeStatus.canEnterDesktopMode(context) && useKeyGestureEventHandler()

                && manageKeyGestures()

                && (Flags.enableMoveToNextDisplayShortcut()

                || Flags.enableTaskResizingKeyboardShortcuts())) {

                || DesktopModeFlags.ENABLE_TASK_RESIZING_KEYBOARD_SHORTCUTS.isTrue())) {

            return Optional.of(new DesktopModeKeyGestureHandler(context,

                    desktopModeWindowDecorViewModel, desktopTasksController,

                    inputManager, shellTaskOrganizer, focusTransitionObserver,

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

+3 −2
Original line number Diff line number Diff line
@@ -23,10 +23,10 @@ import android.hardware.input.InputManager 
import android.hardware.input.InputManager.KeyGestureEventHandler

import android.hardware.input.KeyGestureEvent

import android.os.IBinder

import android.window.DesktopModeFlags

import com.android.hardware.input.Flags.manageKeyGestures

import com.android.internal.protolog.ProtoLog

import com.android.window.flags.Flags.enableMoveToNextDisplayShortcut

import com.android.window.flags.Flags.enableTaskResizingKeyboardShortcuts

import com.android.wm.shell.ShellTaskOrganizer

import com.android.wm.shell.common.DisplayController

import com.android.wm.shell.common.ShellExecutor
@@ -144,7 +144,8 @@ class DesktopModeKeyGestureHandler( 
            KeyGestureEvent.KEY_GESTURE_TYPE_SNAP_RIGHT_FREEFORM_WINDOW,

            KeyGestureEvent.KEY_GESTURE_TYPE_TOGGLE_MAXIMIZE_FREEFORM_WINDOW,

            KeyGestureEvent.KEY_GESTURE_TYPE_MINIMIZE_FREEFORM_WINDOW ->

                enableTaskResizingKeyboardShortcuts() && manageKeyGestures()

                DesktopModeFlags.ENABLE_TASK_RESIZING_KEYBOARD_SHORTCUTS.isTrue &&

                    manageKeyGestures()

            else -> false

        }

libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/scenarios/MaximizeAppWindow.kt

+2 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.tools.NavBar 
import android.tools.Rotation

import android.tools.flicker.rules.ChangeDisplayOrientationRule

import android.tools.traces.parsers.WindowManagerStateHelper

import android.window.DesktopModeFlags

import androidx.test.platform.app.InstrumentationRegistry

import androidx.test.uiautomator.UiDevice

import com.android.launcher3.tapl.LauncherInstrumentation
@@ -59,7 +60,7 @@ constructor( 
    fun setup() {

        Assume.assumeTrue(Flags.enableDesktopWindowingMode() && tapl.isTablet)

        if (usingKeyboard) {

            Assume.assumeTrue(Flags.enableTaskResizingKeyboardShortcuts())

            Assume.assumeTrue(DesktopModeFlags.ENABLE_TASK_RESIZING_KEYBOARD_SHORTCUTS.isTrue)

        }

        tapl.setEnableRotation(true)

        tapl.setExpectedRotation(rotation.value)

libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/scenarios/MinimizeAppWindows.kt

+2 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.tools.NavBar 
import android.tools.Rotation

import android.tools.flicker.rules.ChangeDisplayOrientationRule

import android.tools.traces.parsers.WindowManagerStateHelper

import android.window.DesktopModeFlags

import androidx.test.platform.app.InstrumentationRegistry

import androidx.test.uiautomator.UiDevice

import com.android.launcher3.tapl.LauncherInstrumentation
@@ -62,7 +63,7 @@ constructor( 
        Assume.assumeTrue(Flags.enableDesktopWindowingMode() && tapl.isTablet)

        Assume.assumeTrue(Flags.enableMinimizeButton())

        if (usingKeyboard) {

            Assume.assumeTrue(Flags.enableTaskResizingKeyboardShortcuts())

            Assume.assumeTrue(DesktopModeFlags.ENABLE_TASK_RESIZING_KEYBOARD_SHORTCUTS.isTrue)

        }

        tapl.setEnableRotation(true)

        tapl.setExpectedRotation(rotation.value)