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

Commit 42ca299b authored by Jorge Gil's avatar Jorge Gil Committed by Automerger Merge Worker
Browse files

Merge "Do not change launch mode to FF is FS explicitly requested" into sc-v2-dev am: 7c250811 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15910695

Change-Id: I339ec385c2214fb3e7406c1b6ab4c2986365e46b
parents 932a7a16 7c250811

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

+7 −2
Original line number Diff line number Diff line
@@ -261,7 +261,8 @@ class TaskLaunchParamsModifier implements LaunchParamsModifier { 
            if (launchMode == WINDOWING_MODE_PINNED) {

                if (DEBUG) appendLog("picture-in-picture");

            } else if (!root.isResizeable()) {

                if (shouldLaunchUnresizableAppInFreeform(root, suggestedDisplayArea)) {

                if (shouldLaunchUnresizableAppInFreeform(root, suggestedDisplayArea,

                        options.getLaunchWindowingMode())) {

                    launchMode = WINDOWING_MODE_FREEFORM;

                    if (outParams.mBounds.isEmpty()) {

                        getTaskBounds(root, suggestedDisplayArea, layout, launchMode,
@@ -617,7 +618,11 @@ class TaskLaunchParamsModifier implements LaunchParamsModifier { 
    }



    private boolean shouldLaunchUnresizableAppInFreeform(ActivityRecord activity,

            TaskDisplayArea displayArea) {

            TaskDisplayArea displayArea, int launchWindowingMode) {

        if (launchWindowingMode == WINDOWING_MODE_FULLSCREEN) {

            // Do not launch the activity in freeform if it explicitly requested fullscreen mode.

            return false;

        }

        if (!activity.supportsFreeformInDisplayArea(displayArea) || activity.isResizeable()) {

            return false;

        }