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

Commit f986a3c5 authored by Eghosa Ewansiha-Vlachavas's avatar Eghosa Ewansiha-Vlachavas Committed by Android (Google) Code Review
Browse files

Merge "Move FORCE_CLOSE_TOP_TRANSPARENT_FULLSCREEN_TASK to DesktopExperienceFlags" into main

parents 321b63d7 cbe31a9d

core/java/android/window/DesktopExperienceFlags.java

+3 −3
Original line number Diff line number Diff line
@@ -129,9 +129,6 @@ public enum DesktopExperienceFlags { 
            Flags.FLAG_ENABLE_DYNAMIC_RADIUS_COMPUTATION_BUGFIX),

    ENABLE_EMPTY_DESK_ON_MINIMIZE(Flags::enableEmptyDeskOnMinimize, true,

            Flags.FLAG_ENABLE_EMPTY_DESK_ON_MINIMIZE),

    ENABLE_FORCE_CLOSE_TOP_TRANSPARENT_FULLSCREEN_TASK(

            Flags::forceCloseTopTransparentFullscreenTask, false,

            Flags.FLAG_FORCE_CLOSE_TOP_TRANSPARENT_FULLSCREEN_TASK),

    ENABLE_FREEFORM_BOX_SHADOWS(Flags::enableFreeformBoxShadows, false,

            Flags.FLAG_ENABLE_FREEFORM_BOX_SHADOWS),

    ENABLE_FREEFORM_DISPLAY_LAUNCH_PARAMS(Flags::enableFreeformDisplayLaunchParams, true,
@@ -207,6 +204,9 @@ public enum DesktopExperienceFlags { 
            Flags.FLAG_ENABLE_WINDOW_REPOSITIONING_API),

    ENTER_DESKTOP_BY_DEFAULT_ON_FREEFORM_DISPLAYS(Flags::enterDesktopByDefaultOnFreeformDisplays,

            true, Flags.FLAG_ENTER_DESKTOP_BY_DEFAULT_ON_FREEFORM_DISPLAYS),

    FORCE_CLOSE_TOP_TRANSPARENT_FULLSCREEN_TASK(

            Flags::forceCloseTopTransparentFullscreenTask, false,

            Flags.FLAG_FORCE_CLOSE_TOP_TRANSPARENT_FULLSCREEN_TASK),

    FORM_FACTOR_BASED_DESKTOP_FIRST_SWITCH(Flags::formFactorBasedDesktopFirstSwitch, true,

            Flags.FLAG_FORM_FACTOR_BASED_DESKTOP_FIRST_SWITCH),

    REPARENT_WINDOW_TOKEN_API(Flags::reparentWindowTokenApi, true,

core/java/android/window/DesktopModeFlags.java

+0 −2
Original line number Diff line number Diff line
@@ -137,8 +137,6 @@ public enum DesktopModeFlags { 
    ENABLE_WINDOWING_EDGE_DRAG_RESIZE(Flags::enableWindowingEdgeDragResize, true),

    ENABLE_WINDOWING_SCALED_RESIZING(Flags::enableWindowingScaledResizing, true),

    EXCLUDE_CAPTION_FROM_APP_BOUNDS(Flags::excludeCaptionFromAppBounds, true),

    FORCE_CLOSE_TOP_TRANSPARENT_FULLSCREEN_TASK(

            Flags::forceCloseTopTransparentFullscreenTask, false),

    IGNORE_ASPECT_RATIO_RESTRICTIONS_FOR_RESIZEABLE_FREEFORM_ACTIVITIES(

            Flags::ignoreAspectRatioRestrictionsForResizeableFreeformActivities, true),

    INCLUDE_TOP_TRANSPARENT_FULLSCREEN_TASK_IN_DESKTOP_HEURISTIC(

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

+3 −3
Original line number Diff line number Diff line
@@ -3171,7 +3171,7 @@ class DesktopTasksController( 
            if (!inDesktop && !forceEnterDesktop(displayId)) return null

            if (

                isTransparentTask &&

                    (DesktopModeFlags.FORCE_CLOSE_TOP_TRANSPARENT_FULLSCREEN_TASK.isTrue ||

                    (DesktopExperienceFlags.FORCE_CLOSE_TOP_TRANSPARENT_FULLSCREEN_TASK.isTrue ||

                        DesktopModeFlags

                            .INCLUDE_TOP_TRANSPARENT_FULLSCREEN_TASK_IN_DESKTOP_HEURISTIC

                            .isTrue)
@@ -3203,7 +3203,7 @@ class DesktopTasksController( 
        }

        if (

            isTransparentTask &&

                (DesktopModeFlags.FORCE_CLOSE_TOP_TRANSPARENT_FULLSCREEN_TASK.isTrue ||

                (DesktopExperienceFlags.FORCE_CLOSE_TOP_TRANSPARENT_FULLSCREEN_TASK.isTrue ||

                    DesktopModeFlags.INCLUDE_TOP_TRANSPARENT_FULLSCREEN_TASK_IN_DESKTOP_HEURISTIC

                        .isTrue)

        ) {
@@ -3748,7 +3748,7 @@ class DesktopTasksController( 
    }



    private fun closeTopTransparentFullscreenTask(wct: WindowContainerTransaction, deskId: Int) {

        if (!DesktopModeFlags.FORCE_CLOSE_TOP_TRANSPARENT_FULLSCREEN_TASK.isTrue) return

        if (!DesktopExperienceFlags.FORCE_CLOSE_TOP_TRANSPARENT_FULLSCREEN_TASK.isTrue) return

        val data = taskRepository.getTopTransparentFullscreenTaskData(deskId)

        if (data != null) {

            logD("closeTopTransparentFullscreenTask: taskId=%d, deskId=%d", data.taskId, deskId)

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

+2 −1
Original line number Diff line number Diff line
@@ -82,7 +82,8 @@ class DesktopTasksTransitionObserver( 
        if (

            DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_MODALS_POLICY.isTrue &&

                (DesktopModeFlags.INCLUDE_TOP_TRANSPARENT_FULLSCREEN_TASK_IN_DESKTOP_HEURISTIC

                    .isTrue || DesktopModeFlags.FORCE_CLOSE_TOP_TRANSPARENT_FULLSCREEN_TASK.isTrue)

                    .isTrue ||

                    DesktopExperienceFlags.FORCE_CLOSE_TOP_TRANSPARENT_FULLSCREEN_TASK.isTrue)

        ) {

            updateTopTransparentFullscreenTaskId(info)

        }