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

Commit 8d0334fa authored by Louis Chang's avatar Louis Chang Committed by Android (Google) Code Review
Browse files

Merge "Remove fix_fullscreen_in_multi_window flag" into main

parents 84ede2bb cf2efedf

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

+0 −11
Original line number Diff line number Diff line
@@ -119,17 +119,6 @@ flag { 
    is_fixed_read_only: true

}



flag {

    namespace: "windowing_sdk"

    name: "fix_fullscreen_in_multi_window"

    description: "Let leaf task inherits the windowing mode from the root task."

    bug: "408087047"

    is_fixed_read_only: true

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    namespace: "windowing_sdk"

    name: "update_task_min_dimensions_with_root_activity"

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

+1 −3
Original line number Diff line number Diff line
@@ -295,9 +295,7 @@ class TaskLaunchParamsModifier implements LaunchParamsModifier { 
        } else {

            appendLog("non-freeform-task-display-area");

        }

        boolean isNonRootLeafTask =

                com.android.window.flags.Flags.fixFullscreenInMultiWindow() ? task != null

                        && !task.isRootTask() : false;

        final boolean isNonRootLeafTask = task != null && !task.isRootTask();

        if (launchMode == WINDOWING_MODE_FULLSCREEN && isNonRootLeafTask

                && task.getRootTask().inMultiWindowMode()) {

            // Seems not making sense to have a fullscreen task in a multi-window Task, let it