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

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

Merge "Remove fix_layout_existing_task flag" into main

parents e78e39d5 6a43a460

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

+0 −11
Original line number Diff line number Diff line
@@ -114,17 +114,6 @@ flag { 
    bug: "380132497"

}



flag {

    namespace: "windowing_sdk"

    name: "fix_layout_existing_task"

    description: "Layout the existing task to ensure the bounds are updated."

    bug: "390291971"

    is_fixed_read_only: true

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    namespace: "windowing_sdk"

    name: "cleanup_dispatch_pending_transactions_remote_exception"

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

+3 −5
Original line number Diff line number Diff line
@@ -3072,11 +3072,9 @@ class ActivityStarter { 
            }

        }



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

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

        mSupervisor.getLaunchParamsController().layoutTask(intentTask,

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

        }



        // If the target task is not in the front, then we need to bring it to the front.

        final boolean differentTopTask;

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

+1 −2
Original line number Diff line number Diff line
@@ -94,8 +94,7 @@ class DesktopModeLaunchParamsModifier implements LaunchParamsModifier { 
            return RESULT_SKIP;

        }



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

                && task.getCreatedByOrganizerTask() != null) {

        if (task.getCreatedByOrganizerTask() != null) {

            appendLog("has created-by-organizer-task, skipping");

            return RESULT_SKIP;

        }

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

+2 −15
Original line number Diff line number Diff line
@@ -6111,21 +6111,8 @@ class Task extends TaskFragment { 
                    .build();

        }



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

            mTaskSupervisor.getLaunchParamsController()

                    .layoutTask(task, info.windowLayout, activity, source, options);

        } else {

            int displayId = getDisplayId();

            if (displayId == INVALID_DISPLAY) displayId = DEFAULT_DISPLAY;

            final boolean isLockscreenShown =

                    mAtmService.mKeyguardController.isKeyguardOrAodShowing(displayId);

            if (!mTaskSupervisor.getLaunchParamsController()

                    .layoutTask(task, info.windowLayout, activity, source, options)

                    && !getRequestedOverrideBounds().isEmpty()

                    && task.isResizeable() && !isLockscreenShown) {

                task.setBounds(getRequestedOverrideBounds());

            }

        }

        mTaskSupervisor.getLaunchParamsController().layoutTask(task, info.windowLayout, activity,

                source, options);

        return task;

    }