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

Commit 1f6551e1 authored by Louis Chang's avatar Louis Chang
Browse files

Remove fix_layout_restored_task flag 

Bug: 431762704
Bug: 416441150
Test: wm presubmit
Flag: EXEMPT remove flag
Change-Id: I0970a828eeef88d11daa13e5b1223f06326e73e3
parent 38cd21f2

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

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

}



flag {

    namespace: "windowing_sdk"

    name: "fix_layout_restored_task"

    description: "Layout the restored-from-recent task to ensure the bounds are updated."

    bug: "416441150"

    is_fixed_read_only: true

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    namespace: "windowing_sdk"

    name: "update_task_min_dimensions_with_root_activity"

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java

+2 −3
Original line number Diff line number Diff line
@@ -1127,8 +1127,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
     */

    private void prepareTasksForSplitScreen(int[] taskIds, WindowContainerTransaction wct,

            Bundle[] bundles) {

        if (com.android.window.flags.Flags.fixLayoutRestoredTask()

                && taskIds.length != bundles.length) {

        if (taskIds.length != bundles.length) {

            Slog.w(TAG, "The length of taskIds and bundles are not the same.");

            return;

        }
@@ -1139,7 +1138,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
            if (task != null) {

                wct.setWindowingMode(task.getToken(), WINDOWING_MODE_UNDEFINED)

                        .setBounds(task.getToken(), null /* bounds */);

            } else if (com.android.window.flags.Flags.fixLayoutRestoredTask()) {

            } else {

                // Clear the task bounds via Bundle once the Task is restored.

                ActivityOptions options = ActivityOptions.fromBundle(bundles[i]);

                if (options == null) {

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

+3 −5
Original line number Diff line number Diff line
@@ -2047,11 +2047,9 @@ class ActivityStarter { 
                    ? mSourceRecord.getTask() : null;

            setNewTask(taskToAffiliate);

        } else if (mAddingToTask) {

            if (com.android.window.flags.Flags.fixLayoutRestoredTask()) {

            // Layout the task to ensure the Task is in correct bounds.

            mSupervisor.getLaunchParamsController().layoutTask(targetTask,

                    mStartActivity.info.windowLayout, mStartActivity, mSourceRecord, options);

            }

            addOrReparentStartingActivity(targetTask, "adding to task");

        }