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

Commit 7e3d5b83 authored by Omar Elmekkawy's avatar Omar Elmekkawy
Browse files

Move tiling flag to desktop experience flags for dev option. 

[Needed for dev option launch]
- enable_tile_resizing

Bug: 414544994
Flag: EXEMPT just adding a flag to DesktopExperienceFlags
Test: m
Change-Id: I113b4e8590bde4ee84afdefd663ffa3ebe37902d
parent eda335cc

core/java/android/window/DesktopExperienceFlags.java

+1 −0
Original line number Diff line number Diff line
@@ -154,6 +154,7 @@ public enum DesktopExperienceFlags { 
    ENABLE_TALL_APP_HEADERS(Flags::enableTallAppHeaders, false, Flags.FLAG_ENABLE_TALL_APP_HEADERS),

    ENABLE_TASKBAR_CONNECTED_DISPLAYS(Flags::enableTaskbarConnectedDisplays, true,

            Flags.FLAG_ENABLE_TASKBAR_CONNECTED_DISPLAYS),

    ENABLE_TILE_RESIZING(Flags::enableTileResizing, true, Flags.FLAG_ENABLE_TILE_RESIZING),

    ENABLE_WINDOWING_TRANSITION_HANDLERS_OBSERVERS(

            Flags::enableWindowingTransitionHandlersObservers, false,

            Flags.FLAG_ENABLE_WINDOWING_TRANSITION_HANDLERS_OBSERVERS),

core/java/android/window/DesktopModeFlags.java

+0 −1
Original line number Diff line number Diff line
@@ -131,7 +131,6 @@ public enum DesktopModeFlags { 
    ENABLE_TASK_RESIZING_KEYBOARD_SHORTCUTS(Flags::enableTaskResizingKeyboardShortcuts, true),

    ENABLE_TASK_STACK_OBSERVER_IN_SHELL(Flags::enableTaskStackObserverInShell, true),

    ENABLE_THEMED_APP_HEADERS(Flags::enableThemedAppHeaders, true),

    ENABLE_TILE_RESIZING(Flags::enableTileResizing, true),

    ENABLE_TOP_VISIBLE_ROOT_TASK_PER_USER_TRACKING(Flags::enableTopVisibleRootTaskPerUserTracking,

            true),

    ENABLE_VISUAL_INDICATOR_IN_TRANSITION_BUGFIX(

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

+1 −1
Original line number Diff line number Diff line
@@ -2008,7 +2008,7 @@ class DesktopTasksController( 
            displayController,

        )



        if (DesktopModeFlags.ENABLE_TILE_RESIZING.isTrue()) {

        if (DesktopExperienceFlags.ENABLE_TILE_RESIZING.isTrue()) {

            val isTiled = snapEventHandler.snapToHalfScreen(taskInfo, currentDragBounds, position)

            if (isTiled) {

                taskbarDesktopTaskListener?.onTaskbarCornerRoundingUpdate(true)

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

+1 −1
Original line number Diff line number Diff line
@@ -652,7 +652,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel, 
        DesktopRepository taskRepository = mDesktopUserRepositories.getCurrent();

        Integer leftTiledTaskId = taskRepository.getLeftTiledTask(taskInfo.displayId);

        Integer rightTiledTaskId = taskRepository.getRightTiledTask(taskInfo.displayId);

        boolean tilingAndPersistenceEnabled = DesktopModeFlags.ENABLE_TILE_RESIZING.isTrue()

        boolean tilingAndPersistenceEnabled = DesktopExperienceFlags.ENABLE_TILE_RESIZING.isTrue()

                && DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_PERSISTENCE.isTrue();

        if (leftTiledTaskId != null && leftTiledTaskId == taskInfo.taskId

                && tilingAndPersistenceEnabled) {