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

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

Merge "Remove fix_moving_unfocused_task flag" into main

parents 28262526 df2ad937

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

+0 −11
Original line number Diff line number Diff line
@@ -141,17 +141,6 @@ flag { 
    }

}



flag {

    namespace: "windowing_sdk"

    name: "fix_moving_unfocused_task"

    description: "Avoid moving the visible and unfocused multi-window mode Task to front"

    bug: "399860102"

    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/ActivityStarter.java

+1 −2
Original line number Diff line number Diff line
@@ -1986,8 +1986,7 @@ class ActivityStarter { 
            // To prevent interruption of the user's current focus, if a launch request

            // originates from activities within the same visible task, the task should not be

            // moved to the front, or an unfocused Task could be moved to top unexpectedly.

            if (com.android.window.flags.Flags.fixMovingUnfocusedTask() && !avoidMoveToFront()

                    && sourceRecord != null && sourceRecord.getTask() == targetTask

            if (!avoidMoveToFront() && sourceRecord != null && sourceRecord.getTask() == targetTask

                    && targetTask.isVisible() && targetTask.inMultiWindowMode()) {

                mCanMoveToFrontCode = MOVE_TO_FRONT_AVOID_VISIBLE_MULTI_WINDOW;

            }