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

Commit 28560a22 authored by Chris Li's avatar Chris Li Committed by Android (Google) Code Review
Browse files

Merge "Cleanup embedded Task related code from WindowTestsBase"

parents 9cfcc396 db30b191

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

+1 −2
Original line number Diff line number Diff line
@@ -2958,8 +2958,7 @@ public class ActivityRecordTests extends WindowTestsBase { 
        removeGlobalMinSizeRestriction();

        final Task task = new TaskBuilder(mSupervisor).setCreateParentTask(true).build();

        final Task rootTask = task.getRootTask();

        final TaskFragment taskFragment = createTaskFragmentWithParentTask(task,

                false /* createEmbeddedTask */);

        final TaskFragment taskFragment = createTaskFragmentWithActivity(task);

        final ActivityRecord activity = taskFragment.getTopNonFinishingActivity();

        final Rect stackBounds = new Rect(0, 0, 1000, 600);

        final Rect taskBounds = new Rect(100, 400, 600, 800);

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

+4 −4
Original line number Diff line number Diff line
@@ -505,12 +505,12 @@ public class ActivityStarterTests extends WindowTestsBase { 
        // The fullscreen windowing mode activity will be moved to split-secondary by

        // TestSplitOrganizer when a split-primary task appears.

        final ActivityRecord splitPrimaryActivity = new TaskBuilder(mSupervisor)

                .setParentTaskFragment(splitOrg.mPrimary)

                .setParentTask(splitOrg.mPrimary)

                .setCreateActivity(true)

                .build()

                .getTopMostActivity();

        final ActivityRecord splitSecondActivity = new TaskBuilder(mSupervisor)

                .setParentTaskFragment(splitOrg.mSecondary)

                .setParentTask(splitOrg.mSecondary)

                .setCreateActivity(true)

                .build()

                .getTopMostActivity();
@@ -1055,7 +1055,7 @@ public class ActivityStarterTests extends WindowTestsBase { 
        // Create another activity on top of the secondary display.

        final Task topStack = secondaryTaskContainer.createRootTask(WINDOWING_MODE_FULLSCREEN,

                ACTIVITY_TYPE_STANDARD, true /* onTop */);

        final Task topTask = new TaskBuilder(mSupervisor).setParentTaskFragment(topStack).build();

        final Task topTask = new TaskBuilder(mSupervisor).setParentTask(topStack).build();

        new ActivityBuilder(mAtm).setTask(topTask).build();



        doReturn(mActivityMetricsLogger).when(mSupervisor).getActivityMetricsLogger();
@@ -1251,7 +1251,7 @@ public class ActivityStarterTests extends WindowTestsBase { 
        final ActivityStarter starter = prepareStarter(0 /* flags */);

        starter.mStartActivity = new ActivityBuilder(mAtm).build();

        final Task task = new TaskBuilder(mAtm.mTaskSupervisor)

                .setParentTaskFragment(createTask(mDisplayContent, WINDOWING_MODE_FULLSCREEN,

                .setParentTask(createTask(mDisplayContent, WINDOWING_MODE_FULLSCREEN,

                        ACTIVITY_TYPE_STANDARD))

                .setUserId(10)

                .build();

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

+7 −13
Original line number Diff line number Diff line
@@ -593,7 +593,7 @@ public class AppTransitionControllerTest extends WindowTestsBase { 
        final Task singleTopRoot = createTask(mDisplayContent);

        final TaskBuilder builder = new TaskBuilder(mSupervisor)

                .setWindowingMode(WINDOWING_MODE_MULTI_WINDOW)

                .setParentTaskFragment(singleTopRoot)

                .setParentTask(singleTopRoot)

                .setCreatedByOrganizer(true);

        final Task splitRoot1 = builder.build();

        final Task splitRoot2 = builder.build();
@@ -622,14 +622,12 @@ public class AppTransitionControllerTest extends WindowTestsBase { 
        // [DefaultTDA] - [Task] -+- [TaskFragment1] - [ActivityRecord1] (opening, invisible)

        //                        +- [TaskFragment2] - [ActivityRecord2] (closing, visible)

        final Task parentTask = createTask(mDisplayContent);

        final TaskFragment taskFragment1 = createTaskFragmentWithParentTask(parentTask,

                false /* createEmbeddedTask */);

        final TaskFragment taskFragment1 = createTaskFragmentWithActivity(parentTask);

        final ActivityRecord activity1 = taskFragment1.getTopMostActivity();

        activity1.setVisible(false);

        activity1.mVisibleRequested = true;



        final TaskFragment taskFragment2 = createTaskFragmentWithParentTask(parentTask,

                false /* createEmbeddedTask */);

        final TaskFragment taskFragment2 = createTaskFragmentWithActivity(parentTask);

        final ActivityRecord activity2 = taskFragment2.getTopMostActivity();

        activity2.setVisible(true);

        activity2.mVisibleRequested = false;
@@ -653,14 +651,12 @@ public class AppTransitionControllerTest extends WindowTestsBase { 
        // [DefaultTDA] - [Task] -+- [TaskFragment1] - [ActivityRecord1] (opening, invisible)

        //                        +- [TaskFragment2] - [ActivityRecord2] (closing, visible)

        final Task parentTask = createTask(mDisplayContent);

        final TaskFragment taskFragment1 = createTaskFragmentWithParentTask(parentTask,

                true /* createEmbeddedTask */);

        final TaskFragment taskFragment1 = createTaskFragmentWithActivity(parentTask);

        final ActivityRecord activity1 = taskFragment1.getTopMostActivity();

        activity1.setVisible(false);

        activity1.mVisibleRequested = true;



        final TaskFragment taskFragment2 = createTaskFragmentWithParentTask(parentTask,

                true /* createEmbeddedTask */);

        final TaskFragment taskFragment2 = createTaskFragmentWithActivity(parentTask);

        final ActivityRecord activity2 = taskFragment2.getTopMostActivity();

        activity2.setVisible(true);

        activity2.mVisibleRequested = false;
@@ -684,8 +680,7 @@ public class AppTransitionControllerTest extends WindowTestsBase { 
        // [DefaultTDA] -+- [Task1] - [TaskFragment1] - [ActivityRecord1] (opening, invisible)

        //               +- [Task2] - [ActivityRecord2] (closing, visible)

        final Task task1 = createTask(mDisplayContent);

        final TaskFragment taskFragment1 = createTaskFragmentWithParentTask(task1,

                false /* createEmbeddedTask */);

        final TaskFragment taskFragment1 = createTaskFragmentWithActivity(task1);

        final ActivityRecord activity1 = taskFragment1.getTopMostActivity();

        activity1.setVisible(false);

        activity1.mVisibleRequested = true;
@@ -714,8 +709,7 @@ public class AppTransitionControllerTest extends WindowTestsBase { 
        // [DefaultTDA] -+- [Task1] - [TaskFragment1] - [ActivityRecord1] (closing, visible)

        //               +- [Task2] - [ActivityRecord2] (opening, invisible)

        final Task task1 = createTask(mDisplayContent);

        final TaskFragment taskFragment1 = createTaskFragmentWithParentTask(task1,

                false /* createEmbeddedTask */);

        final TaskFragment taskFragment1 = createTaskFragmentWithActivity(task1);

        final ActivityRecord activity1 = taskFragment1.getTopMostActivity();

        activity1.setVisible(true);

        activity1.mVisibleRequested = false;

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

+7 −14
Original line number Diff line number Diff line
@@ -228,8 +228,7 @@ public class AppTransitionTests extends WindowTestsBase { 


    @Test

    public void testTaskFragmentOpeningTransition() {

        final ActivityRecord activity = createHierarchyForTaskFragmentTest(

                false /* createEmbeddedTask */);

        final ActivityRecord activity = createHierarchyForTaskFragmentTest();

        activity.setVisible(false);



        mDisplayContent.prepareAppTransition(TRANSIT_OPEN);
@@ -243,8 +242,7 @@ public class AppTransitionTests extends WindowTestsBase { 


    @Test

    public void testEmbeddedTaskOpeningTransition() {

        final ActivityRecord activity = createHierarchyForTaskFragmentTest(

                true /* createEmbeddedTask */);

        final ActivityRecord activity = createHierarchyForTaskFragmentTest();

        activity.setVisible(false);



        mDisplayContent.prepareAppTransition(TRANSIT_OPEN);
@@ -258,8 +256,7 @@ public class AppTransitionTests extends WindowTestsBase { 


    @Test

    public void testTaskFragmentClosingTransition() {

        final ActivityRecord activity = createHierarchyForTaskFragmentTest(

                false /* createEmbeddedTask */);

        final ActivityRecord activity = createHierarchyForTaskFragmentTest();

        activity.setVisible(true);



        mDisplayContent.prepareAppTransition(TRANSIT_CLOSE);
@@ -273,8 +270,7 @@ public class AppTransitionTests extends WindowTestsBase { 


    @Test

    public void testEmbeddedTaskClosingTransition() {

        final ActivityRecord activity = createHierarchyForTaskFragmentTest(

                true /* createEmbeddedTask */);

        final ActivityRecord activity = createHierarchyForTaskFragmentTest();

        activity.setVisible(true);



        mDisplayContent.prepareAppTransition(TRANSIT_CLOSE);
@@ -292,19 +288,16 @@ public class AppTransitionTests extends WindowTestsBase { 
     * {@link AppTransitionController#getAnimationTargets(ArraySet, ArraySet, boolean) the animation

     * target} to promote to Task or above.

     *

     * @param createEmbeddedTask {@code true} to create embedded Task for verified TaskFragment

     * @return The Activity to be put in either opening or closing Activity

     */

    private ActivityRecord createHierarchyForTaskFragmentTest(boolean createEmbeddedTask) {

    private ActivityRecord createHierarchyForTaskFragmentTest() {

        final Task parentTask = createTask(mDisplayContent);

        final TaskFragment bottomTaskFragment = createTaskFragmentWithParentTask(parentTask,

                false /* createEmbeddedTask */);

        final TaskFragment bottomTaskFragment = createTaskFragmentWithActivity(parentTask);

        final ActivityRecord bottomActivity = bottomTaskFragment.getTopMostActivity();

        bottomActivity.setOccludesParent(true);

        bottomActivity.setVisible(true);



        final TaskFragment verifiedTaskFragment = createTaskFragmentWithParentTask(parentTask,

                createEmbeddedTask);

        final TaskFragment verifiedTaskFragment = createTaskFragmentWithActivity(parentTask);

        final ActivityRecord activity = verifiedTaskFragment.getTopMostActivity();

        activity.setOccludesParent(true);

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

+4 −4
Original line number Diff line number Diff line
@@ -2693,10 +2693,10 @@ public class DisplayContentTests extends WindowTestsBase { 
                ACTIVITY_TYPE_STANDARD, ON_TOP);

        final Task rootTask4 = taskDisplayArea.createRootTask(WINDOWING_MODE_FULLSCREEN,

                ACTIVITY_TYPE_STANDARD, ON_TOP);

        final Task task1 = new TaskBuilder(mSupervisor).setParentTaskFragment(rootTask1).build();

        final Task task2 = new TaskBuilder(mSupervisor).setParentTaskFragment(rootTask2).build();

        final Task task3 = new TaskBuilder(mSupervisor).setParentTaskFragment(rootTask3).build();

        final Task task4 = new TaskBuilder(mSupervisor).setParentTaskFragment(rootTask4).build();

        final Task task1 = new TaskBuilder(mSupervisor).setParentTask(rootTask1).build();

        final Task task2 = new TaskBuilder(mSupervisor).setParentTask(rootTask2).build();

        final Task task3 = new TaskBuilder(mSupervisor).setParentTask(rootTask3).build();

        final Task task4 = new TaskBuilder(mSupervisor).setParentTask(rootTask4).build();



        // Reordering root tasks while removing root tasks.

        doAnswer(invocation -> {