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

Commit f0281d75 authored by Garfield Tan's avatar Garfield Tan Committed by Automerger Merge Worker
Browse files

Merge "Use resolved windowing mode to match launch root" into sc-dev am: 9c907184 

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

Change-Id: I7e8af2d611b3fa9c8a15b93e2ab70ff8e62e4e41
parents b46323ae 9c907184

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

+4 −3
Original line number Diff line number Diff line
@@ -2818,7 +2818,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> 
     * @param launchParams   The resolved launch params to use.

     * @param realCallingPid The pid from {@link ActivityStarter#setRealCallingPid}

     * @param realCallingUid The uid from {@link ActivityStarter#setRealCallingUid}

     * @return The roott task to use for the launch or INVALID_TASK_ID.

     * @return The root task to use for the launch or INVALID_TASK_ID.

     */

    Task getLaunchRootTask(@Nullable ActivityRecord r,

            @Nullable ActivityOptions options, @Nullable Task candidateTask, boolean onTop,
@@ -2887,7 +2887,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> 
                // Falling back to default task container

                taskDisplayArea = taskDisplayArea.mDisplayContent.getDefaultTaskDisplayArea();

                rootTask = taskDisplayArea.getOrCreateRootTask(r, options, candidateTask,

                        activityType, onTop);

                        launchParams, activityType, onTop);

                if (rootTask != null) {

                    return rootTask;

                }
@@ -2942,7 +2942,8 @@ class RootWindowContainer extends WindowContainer<DisplayContent> 
            }

        }



        return container.getOrCreateRootTask(r, options, candidateTask, activityType, onTop);

        return container.getOrCreateRootTask(

                r, options, candidateTask, launchParams, activityType, onTop);

    }



    /** @return true if activity record is null or can be launched on provided display. */

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

+12 −5
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ import com.android.internal.util.ArrayUtils; 
import com.android.internal.util.ToBooleanFunction;

import com.android.internal.util.function.pooled.PooledLambda;

import com.android.internal.util.function.pooled.PooledPredicate;

import com.android.server.wm.LaunchParamsController.LaunchParams;



import java.io.PrintWriter;

import java.util.ArrayList;
@@ -1072,11 +1073,17 @@ final class TaskDisplayArea extends DisplayArea<WindowContainer> { 
     * @see #getOrCreateRootTask(int, int, boolean)

     */

    Task getOrCreateRootTask(@Nullable ActivityRecord r,

            @Nullable ActivityOptions options, @Nullable Task candidateTask, int activityType,

            boolean onTop) {

        // First preference is the windowing mode in the activity options if set.

        int windowingMode = (options != null)

                ? options.getLaunchWindowingMode() : WINDOWING_MODE_UNDEFINED;

            @Nullable ActivityOptions options, @Nullable Task candidateTask,

            @Nullable LaunchParams launchParams, int activityType, boolean onTop) {

        int windowingMode = WINDOWING_MODE_UNDEFINED;

        if (launchParams != null) {

            // If launchParams isn't null, windowing mode is already resolved.

            windowingMode = launchParams.mWindowingMode;

        } else if (options != null) {

            // If launchParams is null and options isn't let's use the windowing mode in the

            // options.

            windowingMode = options.getLaunchWindowingMode();

        }

        // Validate that our desired windowingMode will work under the current conditions.

        // UNDEFINED windowing mode is a valid result and means that the new root task will inherit

        // it's display's windowing mode.

services/tests/wmtests/src/com/android/server/wm/TaskDisplayAreaTests.java

+46 −0
Original line number Diff line number Diff line
@@ -42,16 +42,20 @@ import static com.google.common.truth.Truth.assertThat; 
import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertNotNull;

import static org.junit.Assert.assertSame;

import static org.junit.Assert.assertTrue;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.verify;



import android.app.ActivityOptions;

import android.platform.test.annotations.Presubmit;



import androidx.test.filters.SmallTest;



import com.android.server.wm.LaunchParamsController.LaunchParams;



import org.junit.After;

import org.junit.Before;

import org.junit.Test;
@@ -86,6 +90,48 @@ public class TaskDisplayAreaTests extends WindowTestsBase { 
        mPinnedTask.removeImmediately();

    }



    @Test

    public void getOrCreateLaunchRootRespectsResolvedWindowingMode() {

        final Task rootTask = createTaskStackOnDisplay(

                WINDOWING_MODE_MULTI_WINDOW, ACTIVITY_TYPE_STANDARD, mDisplayContent);

        rootTask.mCreatedByOrganizer = true;

        final TaskDisplayArea taskDisplayArea = rootTask.getDisplayArea();

        taskDisplayArea.setLaunchRootTask(

                rootTask, new int[]{WINDOWING_MODE_FREEFORM}, new int[]{ACTIVITY_TYPE_STANDARD});



        final Task candidateRootTask = createTaskStackOnDisplay(

                WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, mDisplayContent);

        final ActivityRecord activity = createNonAttachedActivityRecord(mDisplayContent);

        final LaunchParams launchParams = new LaunchParams();

        launchParams.mWindowingMode = WINDOWING_MODE_FREEFORM;



        final Task actualRootTask = taskDisplayArea.getOrCreateRootTask(

                activity, null /* options */, candidateRootTask,

                launchParams, ACTIVITY_TYPE_STANDARD, true /* onTop */);

        assertSame(rootTask, actualRootTask.getRootTask());

    }



    @Test

    public void getOrCreateLaunchRootUsesActivityOptionsWindowingMode() {

        final Task rootTask = createTaskStackOnDisplay(

                WINDOWING_MODE_MULTI_WINDOW, ACTIVITY_TYPE_STANDARD, mDisplayContent);

        rootTask.mCreatedByOrganizer = true;

        final TaskDisplayArea taskDisplayArea = rootTask.getDisplayArea();

        taskDisplayArea.setLaunchRootTask(

                rootTask, new int[]{WINDOWING_MODE_FREEFORM}, new int[]{ACTIVITY_TYPE_STANDARD});



        final Task candidateRootTask = createTaskStackOnDisplay(

                WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, mDisplayContent);

        final ActivityRecord activity = createNonAttachedActivityRecord(mDisplayContent);

        final ActivityOptions options = ActivityOptions.makeBasic();

        options.setLaunchWindowingMode(WINDOWING_MODE_FREEFORM);



        final Task actualRootTask = taskDisplayArea.getOrCreateRootTask(

                activity, options, candidateRootTask,

                null /* launchParams */, ACTIVITY_TYPE_STANDARD, true /* onTop */);

        assertSame(rootTask, actualRootTask.getRootTask());

    }



    @Test

    public void testActivityWithZBoost_taskDisplayAreaDoesNotMoveUp() {

        final Task stack = createTaskStackOnDisplay(