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

Commit 401dc73a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Merge StackBuilder into TaskBuilder"

parents cf63ea8a 96ca290b

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

+10 −11
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ public class ActivityDisplayTests extends WindowTestsBase { 
        final TaskDisplayArea taskDisplayAreas =

                mRootWindowContainer.getDefaultDisplay().getDefaultTaskDisplayArea();

        final Task stack =

                new StackBuilder(mRootWindowContainer).setOnTop(!ON_TOP).build();

                new TaskBuilder(mSupervisor).setOnTop(!ON_TOP).setCreateActivity(true).build();

        final Task prevFocusedStack = taskDisplayAreas.getFocusedStack();



        stack.moveToFront("moveStackToFront");
@@ -90,7 +90,7 @@ public class ActivityDisplayTests extends WindowTestsBase { 
        final Task pinnedStack = mRootWindowContainer.getDefaultTaskDisplayArea()

                .createStack(WINDOWING_MODE_PINNED, ACTIVITY_TYPE_STANDARD, ON_TOP);

        final Task pinnedTask = new TaskBuilder(mAtm.mStackSupervisor)

                .setStack(pinnedStack).build();

                .setParentTask(pinnedStack).build();

        new ActivityBuilder(mAtm).setActivityFlags(FLAG_ALWAYS_FOCUSABLE)

                .setTask(pinnedTask).build();

        pinnedStack.moveToFront("movePinnedStackToFront");
@@ -144,7 +144,7 @@ public class ActivityDisplayTests extends WindowTestsBase { 
        doReturn(false).when(display).shouldDestroyContentOnRemove();



        // Put home stack on the display.

        final Task homeStack = new StackBuilder(mRootWindowContainer)

        final Task homeStack = new TaskBuilder(mSupervisor)

                .setDisplay(display).setActivityType(ACTIVITY_TYPE_HOME).build();



        // Put a finishing standard activity which will be reparented.
@@ -163,7 +163,7 @@ public class ActivityDisplayTests extends WindowTestsBase { 
        final Task fullscreenStack = display.getDefaultTaskDisplayArea().createStack(

                WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, ON_TOP);

        final Task fullscreenTask = new TaskBuilder(mAtm.mStackSupervisor)

                .setStack(fullscreenStack).build();

                .setParentTask(fullscreenStack).build();

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

        return fullscreenStack;

    }
@@ -175,12 +175,11 @@ public class ActivityDisplayTests extends WindowTestsBase { 
    public void testTopRunningActivity() {

        final DisplayContent display = mRootWindowContainer.getDefaultDisplay();

        final KeyguardController keyguard = mSupervisor.getKeyguardController();

        final Task stack = new StackBuilder(mRootWindowContainer).build();

        final Task stack = new TaskBuilder(mSupervisor).setCreateActivity(true).build();

        final ActivityRecord activity = stack.getTopNonFinishingActivity();



        // Create empty stack on top.

        final Task emptyStack =

                new StackBuilder(mRootWindowContainer).setCreateActivity(false).build();

        final Task emptyStack = new TaskBuilder(mSupervisor).build();



        // Make sure the top running activity is not affected when keyguard is not locked.

        assertTopRunningActivity(activity, display);
@@ -322,10 +321,10 @@ public class ActivityDisplayTests extends WindowTestsBase { 
                ACTIVITY_TYPE_STANDARD, ON_TOP);

        final Task stack4 = taskDisplayArea.createStack(WINDOWING_MODE_FULLSCREEN,

                ACTIVITY_TYPE_STANDARD, ON_TOP);

        final Task task1 = new TaskBuilder(mAtm.mStackSupervisor).setStack(stack1).build();

        final Task task2 = new TaskBuilder(mAtm.mStackSupervisor).setStack(stack2).build();

        final Task task3 = new TaskBuilder(mAtm.mStackSupervisor).setStack(stack3).build();

        final Task task4 = new TaskBuilder(mAtm.mStackSupervisor).setStack(stack4).build();

        final Task task1 = new TaskBuilder(mAtm.mStackSupervisor).setParentTask(stack1).build();

        final Task task2 = new TaskBuilder(mAtm.mStackSupervisor).setParentTask(stack2).build();

        final Task task3 = new TaskBuilder(mAtm.mStackSupervisor).setParentTask(stack3).build();

        final Task task4 = new TaskBuilder(mAtm.mStackSupervisor).setParentTask(stack4).build();



        // Reordering stacks while removing stacks.

        doAnswer(invocation -> {

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

+1 −2
Original line number Diff line number Diff line
@@ -341,9 +341,8 @@ public class ActivityMetricsLaunchObserverTests extends WindowTestsBase { 
    public void testConsecutiveLaunchOnDifferentDisplay() {

        onActivityLaunched(mTopActivity);



        final Task stack = new StackBuilder(mRootWindowContainer)

        final Task stack = new TaskBuilder(mSupervisor)

                .setDisplay(addNewDisplayContentAt(DisplayContent.POSITION_BOTTOM))

                .setCreateActivity(false)

                .build();

        final ActivityRecord activityOnNewDisplay = new ActivityBuilder(mAtm)

                .setStack(stack)

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

+11 −11
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ public class ActivityRecordTests extends WindowTestsBase { 


    @Before

    public void setUp() throws Exception {

        mStack = new StackBuilder(mRootWindowContainer).build();

        mStack = new TaskBuilder(mSupervisor).setCreateActivity(true).build();

        mTask = mStack.getBottomMostTask();

        mActivity = mTask.getTopNonFinishingActivity();
@@ -172,7 +172,7 @@ public class ActivityRecordTests extends WindowTestsBase { 


    @Test

    public void testNoCleanupMovingActivityInSameStack() {

        final Task newTask = new TaskBuilder(mAtm.mStackSupervisor).setStack(mStack).build();

        final Task newTask = new TaskBuilder(mAtm.mStackSupervisor).setParentTask(mStack).build();

        mActivity.reparent(newTask, 0, null /*reason*/);

        verify(mStack, times(0)).cleanUpActivityReferences(any());

    }
@@ -262,7 +262,7 @@ public class ActivityRecordTests extends WindowTestsBase { 


        // Set options for two ActivityRecords in separate Tasks. Apply one ActivityRecord options.

        // Pending options should be cleared for only ActivityRecord that was applied

        Task task2 = new TaskBuilder(mAtm.mStackSupervisor).setStack(mStack).build();

        Task task2 = new TaskBuilder(mAtm.mStackSupervisor).setParentTask(mStack).build();

        activity2 = new ActivityBuilder(mAtm).setTask(task2).build();

        activity2.updateOptionsLocked(activityOptions);

        mActivity.updateOptionsLocked(activityOptions);
@@ -548,7 +548,7 @@ public class ActivityRecordTests extends WindowTestsBase { 
                .build();

        mActivity.setState(Task.ActivityState.STOPPED, "Testing");



        final Task stack = new StackBuilder(mRootWindowContainer).build();

        final Task stack = new TaskBuilder(mSupervisor).setCreateActivity(true).build();

        try {

            doReturn(false).when(stack).isTranslucent(any());

            assertFalse(mStack.shouldBeVisible(null /* starting */));
@@ -756,14 +756,14 @@ public class ActivityRecordTests extends WindowTestsBase { 
    @Test

    public void testFinishActivityIfPossible_adjustStackOrder() {

        // Prepare the stacks with order (top to bottom): mStack, stack1, stack2.

        final Task stack1 = new StackBuilder(mRootWindowContainer).build();

        final Task stack1 = new TaskBuilder(mSupervisor).setCreateActivity(true).build();

        mStack.moveToFront("test");

        // The stack2 is needed here for moving back to simulate the

        // {@link DisplayContent#mPreferredTopFocusableStack} is cleared, so

        // {@link DisplayContent#getFocusedStack} will rely on the order of focusable-and-visible

        // stacks. Then when mActivity is finishing, its stack will be invisible (no running

        // activities in the stack) that is the key condition to verify.

        final Task stack2 = new StackBuilder(mRootWindowContainer).build();

        final Task stack2 = new TaskBuilder(mSupervisor).setCreateActivity(true).build();

        stack2.moveToBack("test", stack2.getBottomMostTask());



        assertTrue(mStack.isTopStackInDisplayArea());
@@ -973,7 +973,7 @@ public class ActivityRecordTests extends WindowTestsBase { 


        // Simulates that {@code currentTop} starts an existing activity from background (so its

        // state is stopped) and the starting flow just goes to place it at top.

        final Task nextStack = new StackBuilder(mRootWindowContainer).build();

        final Task nextStack = new TaskBuilder(mSupervisor).setCreateActivity(true).build();

        final ActivityRecord nextTop = nextStack.getTopNonFinishingActivity();

        nextTop.setState(STOPPED, "test");
@@ -1095,7 +1095,7 @@ public class ActivityRecordTests extends WindowTestsBase { 


        // Add another stack to become focused and make the activity there visible. This way it

        // simulates finishing in non-focused stack in split-screen.

        final Task stack = new StackBuilder(mRootWindowContainer).build();

        final Task stack = new TaskBuilder(mSupervisor).setCreateActivity(true).build();

        final ActivityRecord focusedActivity = stack.getTopMostActivity();

        focusedActivity.nowVisible = true;

        focusedActivity.mVisibleRequested = true;
@@ -1581,7 +1581,7 @@ public class ActivityRecordTests extends WindowTestsBase { 


        // Create a new task with custom config to reparent the activity to.

        final Task newTask =

                new TaskBuilder(mSupervisor).setStack(initialTask.getRootTask()).build();

                new TaskBuilder(mSupervisor).setParentTask(initialTask.getRootTask()).build();

        final Configuration newConfig = newTask.getConfiguration();

        newConfig.densityDpi += 100;

        newTask.onRequestedOverrideConfigurationChanged(newConfig);
@@ -1613,7 +1613,7 @@ public class ActivityRecordTests extends WindowTestsBase { 


        // Create a new task with custom config to reparent the second activity to.

        final Task newTask =

                new TaskBuilder(mSupervisor).setStack(initialTask.getRootTask()).build();

                new TaskBuilder(mSupervisor).setParentTask(initialTask.getRootTask()).build();

        final Configuration newConfig = newTask.getConfiguration();

        newConfig.densityDpi += 100;

        newTask.onRequestedOverrideConfigurationChanged(newConfig);
@@ -1750,7 +1750,7 @@ public class ActivityRecordTests extends WindowTestsBase { 
        }

        final Task stack = display.getDefaultTaskDisplayArea()

                .createStack(WINDOWING_MODE_UNDEFINED, ACTIVITY_TYPE_STANDARD, true /* onTop */);

        final Task task = new TaskBuilder(mSupervisor).setStack(stack).build();

        final Task task = new TaskBuilder(mSupervisor).setParentTask(stack).build();

        return new ActivityBuilder(mAtm).setTask(task).setUseProcess(process).build();

    }

}

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

+2 −2
Original line number Diff line number Diff line
@@ -115,8 +115,8 @@ public class ActivityStackSupervisorTests extends WindowTestsBase { 
    public void testHandleNonResizableTaskOnSecondaryDisplay() {

        // Create an unresizable task on secondary display.

        final DisplayContent newDisplay = addNewDisplayContentAt(DisplayContent.POSITION_TOP);

        final Task stack = new StackBuilder(mRootWindowContainer)

                .setDisplay(newDisplay).build();

        final Task stack = new TaskBuilder(mSupervisor)

                .setDisplay(newDisplay).setCreateActivity(true).build();

        final ActivityRecord unresizableActivity = stack.getTopNonFinishingActivity();

        final Task task = unresizableActivity.getTask();

        unresizableActivity.info.resizeMode = ActivityInfo.RESIZE_MODE_UNRESIZEABLE;

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

+3 −3
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ public class ActivityStackTests extends WindowTestsBase { 
        mStack = mDefaultTaskDisplayArea.createStack(WINDOWING_MODE_UNDEFINED,

                ACTIVITY_TYPE_STANDARD, true /* onTop */);

        spyOn(mStack);

        mTask = new TaskBuilder(mSupervisor).setStack(mStack).build();

        mTask = new TaskBuilder(mSupervisor).setParentTask(mStack).build();

    }



    @Test
@@ -330,7 +330,7 @@ public class ActivityStackTests extends WindowTestsBase { 
                targetActivity);

        final ComponentName alias = new ComponentName(DEFAULT_COMPONENT_PACKAGE_NAME,

                aliasActivity);

        final Task task = new TaskBuilder(mAtm.mStackSupervisor).setStack(mStack).build();

        final Task task = new TaskBuilder(mAtm.mStackSupervisor).setParentTask(mStack).build();

        task.origActivity = alias;

        task.realActivity = target;

        new ActivityBuilder(mAtm).setComponent(target).setTask(task).setTargetActivity(
@@ -995,7 +995,7 @@ public class ActivityStackTests extends WindowTestsBase { 
            mDefaultTaskDisplayArea.positionChildAt(onTop ? POSITION_TOP : POSITION_BOTTOM, task,

                    false /* includingParents */);

        } else {

            task = new StackBuilder(mRootWindowContainer)

            task = new TaskBuilder(mSupervisor)

                    .setTaskDisplayArea(taskDisplayArea)

                    .setWindowingMode(windowingMode)

                    .setActivityType(activityType)