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

Commit 5ef0fe3d authored by Graciela Putri's avatar Graciela Putri Committed by Android (Google) Code Review
Browse files

Merge "Don't inherit preferredTaskDisplayArea" into main

parents 1a73cdb4 3c7c868e

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

+3 −1
Original line number Diff line number Diff line
@@ -151,8 +151,10 @@ class DesktopModeLaunchParamsModifier implements LaunchParamsModifier { 
            return RESULT_SKIP;

        }



        // Copy over any values

        // TODO(b/419222219): Remove inheritance on currentParams.

        // Copy over any values.

        outParams.set(currentParams);

        outParams.mPreferredTaskDisplayArea = suggestedDisplayArea;



        boolean isFullscreenInDeskTask = inDesktopFirstContainer && requestFullscreen;

        if (source != null && source.getTask() != null) {

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

+6 −4
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ import static com.android.server.wm.LaunchParamsController.LaunchParamsModifier. 
import static com.android.server.wm.SizeCompatTests.rotateDisplay;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertNotEquals;

import static org.junit.Assert.assertNotNull;

import static org.junit.Assert.assertTrue;

import static org.mockito.ArgumentMatchers.any;
@@ -1579,17 +1580,18 @@ public class DesktopModeLaunchParamsModifierTests extends 


    @Test

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODE)

    public void testUsesDisplayAreaAndWindowingModeFromSource() {

    public void testInheritWindowingModeFromCurrentParams() {

        setupDesktopModeLaunchParamsModifier();



        final Task task = new TaskBuilder(mSupervisor).setActivityType(

                ACTIVITY_TYPE_STANDARD).build();

        TaskDisplayArea mockTaskDisplayArea = mock(TaskDisplayArea.class);

        mCurrent.mPreferredTaskDisplayArea = mockTaskDisplayArea;

        final TaskDisplayArea currTaskDisplayArea = mock(TaskDisplayArea.class);

        mCurrent.mPreferredTaskDisplayArea = currTaskDisplayArea;

        mCurrent.mWindowingMode = WINDOWING_MODE_FREEFORM;



        assertEquals(RESULT_CONTINUE, new CalculateRequestBuilder().setTask(task).calculate());

        assertEquals(mockTaskDisplayArea, mResult.mPreferredTaskDisplayArea);

        assertEquals(task.getRootTask().getDisplayArea(), mResult.mPreferredTaskDisplayArea);

        assertNotEquals(currTaskDisplayArea, mResult.mPreferredTaskDisplayArea);

        assertEquals(WINDOWING_MODE_FREEFORM, mResult.mWindowingMode);

    }