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

Commit 3c3e7b5d authored by Ben Lin's avatar Ben Lin Committed by Android (Google) Code Review
Browse files

Merge "Add TaskDisplayArea tests for child tasks getting winMode change" into main

parents 88732135 fad225bf

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

+2 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ public class TaskDisplayAreaTests extends WindowTestsBase { 
    @Test

    public void getOrCreateLaunchRootUsesActivityOptionsWindowingMode() {

        final Task rootTask = createTask(

                mDisplayContent, WINDOWING_MODE_MULTI_WINDOW, ACTIVITY_TYPE_STANDARD);

                mDisplayContent, WINDOWING_MODE_FREEFORM, ACTIVITY_TYPE_STANDARD);

        rootTask.mCreatedByOrganizer = true;

        final TaskDisplayArea taskDisplayArea = rootTask.getDisplayArea();

        taskDisplayArea.setLaunchRootTask(
@@ -189,6 +189,7 @@ public class TaskDisplayAreaTests extends WindowTestsBase { 
                null /* launchParams */, 0 /* launchFlags */, ACTIVITY_TYPE_STANDARD,

                true /* onTop */);

        assertSame(rootTask, actualRootTask.getRootTask());

        assertEquals(WINDOWING_MODE_FREEFORM, candidateRootTask.getWindowingMode());

    }



    @Test