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

Commit 35318afb authored by Jeff Chang's avatar Jeff Chang Committed by Automerger Merge Worker
Browse files

Merge "Fix split screen test case failure" into tm-qpr-dev am: 8af0860b 

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



Change-Id: Id7035e7f56837917dc668a2a9a4199614e5a12b0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9c7e7777 8af0860b

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/StageCoordinatorTests.java

+3 −3
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ public class StageCoordinatorTests extends ShellTestCase { 
        final ActivityManager.RunningTaskInfo task = new TestRunningTaskInfoBuilder().build();



        // Verify move to undefined stage while split screen not activated moves task to side stage.

        when(mMainStage.isActive()).thenReturn(false);

        when(mStageCoordinator.isSplitScreenVisible()).thenReturn(false);

        mStageCoordinator.setSideStagePosition(SPLIT_POSITION_TOP_OR_LEFT, null);

        mStageCoordinator.moveToStage(task, STAGE_TYPE_UNDEFINED, SPLIT_POSITION_BOTTOM_OR_RIGHT,

                new WindowContainerTransaction());
@@ -163,7 +163,7 @@ public class StageCoordinatorTests extends ShellTestCase { 
        assertEquals(SPLIT_POSITION_BOTTOM_OR_RIGHT, mStageCoordinator.getSideStagePosition());



        // Verify move to undefined stage after split screen activated moves task based on position.

        when(mMainStage.isActive()).thenReturn(true);

        when(mStageCoordinator.isSplitScreenVisible()).thenReturn(true);

        assertEquals(SPLIT_POSITION_TOP_OR_LEFT, mStageCoordinator.getMainStagePosition());

        mStageCoordinator.moveToStage(task, STAGE_TYPE_UNDEFINED, SPLIT_POSITION_TOP_OR_LEFT,

                new WindowContainerTransaction());
@@ -262,7 +262,7 @@ public class StageCoordinatorTests extends ShellTestCase { 


    @Test

    public void testResolveStartStage_afterSplitActivated_retrievesStagePosition() {

        when(mMainStage.isActive()).thenReturn(true);

        when(mStageCoordinator.isSplitScreenVisible()).thenReturn(true);

        mStageCoordinator.setSideStagePosition(SPLIT_POSITION_TOP_OR_LEFT, null /* wct */);



        mStageCoordinator.resolveStartStage(STAGE_TYPE_UNDEFINED, SPLIT_POSITION_TOP_OR_LEFT,