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

Commit de9851e8 authored by Daichi Hirono's avatar Daichi Hirono
Browse files

Migrates Flag.enableMoveToNextDisplayShortcut() to use DesktopExperienceFlag 

Bug: 407922684
Flag: com.android.window.flags.enable_move_to_next_display_shortcut
Test: None as mecanical change
Change-Id: I3beb4aaea3a7df243dd3474b362fbffb6e6105e9
parent 53f2f8a8

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

+7 −6
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import android.view.Choreographer; 
import android.view.IWindowManager;

import android.view.SurfaceControl;

import android.view.WindowManager;

import android.window.DesktopExperienceFlags;

import android.window.DesktopModeFlags;



import androidx.annotation.OptIn;
@@ -48,7 +49,6 @@ import com.android.internal.logging.UiEventLogger; 
import com.android.internal.statusbar.IStatusBarService;

import com.android.internal.util.LatencyTracker;

import com.android.launcher3.icons.IconProvider;

import com.android.window.flags.Flags;

import com.android.wm.shell.RootDisplayAreaOrganizer;

import com.android.wm.shell.RootTaskDisplayAreaOrganizer;

import com.android.wm.shell.ShellTaskOrganizer;
@@ -192,18 +192,19 @@ import com.android.wm.shell.windowdecor.education.DesktopWindowingEducationToolt 
import com.android.wm.shell.windowdecor.tiling.DesktopTilingDecorViewModel;

import com.android.wm.shell.windowdecor.viewholder.AppHandleNotifier;



import java.util.ArrayList;

import java.util.List;

import java.util.Optional;



import dagger.Binds;

import dagger.Lazy;

import dagger.Module;

import dagger.Provides;



import kotlinx.coroutines.CoroutineScope;

import kotlinx.coroutines.ExperimentalCoroutinesApi;

import kotlinx.coroutines.MainCoroutineDispatcher;



import java.util.ArrayList;

import java.util.List;

import java.util.Optional;



/**

 * Provides dependencies from {@link com.android.wm.shell}, these dependencies are only accessible

 * from components within the WM subcomponent (can be explicitly exposed to the SysUIComponent, see
@@ -1077,7 +1078,7 @@ public abstract class WMShellModule { 
            DisplayController displayController,

            DesktopState desktopState) {

        if (desktopState.canEnterDesktopMode()

                && (Flags.enableMoveToNextDisplayShortcut()

                && (DesktopExperienceFlags.ENABLE_MOVE_TO_NEXT_DISPLAY_SHORTCUT.isTrue()

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

            return Optional.of(new DesktopModeKeyGestureHandler(context,

                    desktopModeWindowDecorViewModel, desktopTasksController,

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

+5 −2
Original line number Diff line number Diff line
@@ -1712,7 +1712,7 @@ class DesktopTasksController( 
            }

            if (bounds != null) {

                wct.setBounds(task.token, bounds)

            } else if (Flags.enableMoveToNextDisplayShortcut()) {

            } else if (DesktopExperienceFlags.ENABLE_MOVE_TO_NEXT_DISPLAY_SHORTCUT.isTrue) {

                applyFreeformDisplayChange(wct, task, displayId, destinationDeskId)

            }

        }
@@ -1772,7 +1772,10 @@ class DesktopTasksController( 
            return

        }



        if (!Flags.enableNonDefaultDisplaySplit() || !Flags.enableMoveToNextDisplayShortcut()) {

        if (

            !Flags.enableNonDefaultDisplaySplit() ||

                !DesktopExperienceFlags.ENABLE_MOVE_TO_NEXT_DISPLAY_SHORTCUT.isTrue

        ) {

            return

        }

packages/SystemUI/src/com/android/systemui/keyboard/shortcut/data/source/MultitaskingShortcutsSource.kt

+2 −2
Original line number Diff line number Diff line
@@ -30,12 +30,12 @@ import android.view.KeyEvent.KEYCODE_RIGHT_BRACKET 
import android.view.KeyEvent.META_CTRL_ON

import android.view.KeyEvent.META_META_ON

import android.view.KeyboardShortcutGroup

import android.window.DesktopExperienceFlags

import android.window.DesktopModeFlags

import com.android.systemui.dagger.qualifiers.Application

import com.android.systemui.dagger.qualifiers.Main

import com.android.systemui.keyboard.shortcut.data.model.shortcutInfo

import com.android.systemui.res.R

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

import com.android.wm.shell.shared.desktopmode.DesktopModeStatus

import javax.inject.Inject
@@ -83,7 +83,7 @@ constructor(@Main private val resources: Resources, @Application private val con 
                }

            )

        }

        if (enableMoveToNextDisplayShortcut()) {

        if (DesktopExperienceFlags.ENABLE_MOVE_TO_NEXT_DISPLAY_SHORTCUT.isTrue()) {

            // Move a window to the next display:

            //  - Meta + Ctrl + D

            add(

services/core/java/com/android/server/input/InputGestureManager.java

+1 −2
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import static com.android.hardware.input.Flags.enableTalkbackAndMagnifierKeyGest 
import static com.android.hardware.input.Flags.enableVoiceAccessKeyGestures;

import static com.android.hardware.input.Flags.keyboardA11yShortcutControl;

import static com.android.server.flags.Flags.newBugreportKeyboardShortcut;

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



import android.annotation.NonNull;

import android.annotation.Nullable;
@@ -186,7 +185,7 @@ final class InputGestureManager { 
                    KeyGestureEvent.KEY_GESTURE_TYPE_TRIGGER_BUG_REPORT

            ));

        }

        if (enableMoveToNextDisplayShortcut()) {

        if (DesktopExperienceFlags.ENABLE_MOVE_TO_NEXT_DISPLAY_SHORTCUT.isTrue()) {

            systemShortcuts.add(createKeyGesture(

                    KeyEvent.KEYCODE_D,

                    KeyEvent.META_META_ON | KeyEvent.META_CTRL_ON,