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

Commit eda335cc authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Convert nested_tasks_with_independent_bounds to bugfix" into main

parents 0a9c02b2 24cf6c9e

core/java/android/window/DesktopExperienceFlags.java

+3 −0
Original line number Diff line number Diff line
@@ -127,6 +127,9 @@ public enum DesktopExperienceFlags { 
            Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND),

    ENABLE_MULTIPLE_DESKTOPS_FRONTEND(Flags::enableMultipleDesktopsFrontend, false,

            Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_FRONTEND),

    ENABLE_NESTED_TASKS_WITH_INDEPENDENT_BOUNDS_BUGFIX(

            Flags::nestedTasksWithIndependentBoundsBugfix, false,

            Flags.FLAG_NESTED_TASKS_WITH_INDEPENDENT_BOUNDS_BUGFIX),

    ENABLE_PERSISTING_DISPLAY_SIZE_FOR_CONNECTED_DISPLAYS(

            Flags::enablePersistingDisplaySizeForConnectedDisplays, true,

            Flags.FLAG_ENABLE_PERSISTING_DISPLAY_SIZE_FOR_CONNECTED_DISPLAYS),

core/java/android/window/flags/lse_desktop_experience.aconfig

+4 −1
Original line number Diff line number Diff line
@@ -644,10 +644,13 @@ flag { 
}



flag {

    name: "nested_tasks_with_independent_bounds"

    name: "nested_tasks_with_independent_bounds_bugfix"

    namespace: "lse_desktop_experience"

    description: "Allows tasks under a root task to be have independent (non-inherited) bounds"

    bug: "402825303"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

services/core/java/com/android/server/wm/Task.java

+1 −1
Original line number Diff line number Diff line
@@ -2423,7 +2423,7 @@ class Task extends TaskFragment { 
        final int windowingMode = getWindowingMode();

        final boolean isNonStandardOrFullscreen = !isActivityTypeStandardOrUndefined()

                || windowingMode == WINDOWING_MODE_FULLSCREEN;

        if (!Flags.nestedTasksWithIndependentBounds()

        if (!DesktopExperienceFlags.ENABLE_NESTED_TASKS_WITH_INDEPENDENT_BOUNDS_BUGFIX.isTrue()

                && !DesktopExperienceFlags.ENABLE_MULTIPLE_DESKTOPS_BACKEND.isTrue()) {

            final Rect bounds;

            if (hasParentTask && rootTask.isOrganized()) {