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

Commit ad87661f authored by Matt Sziklay's avatar Matt Sziklay Committed by Android (Google) Code Review
Browse files

Merge "Fix split select tests." into main

parents ad77976e 6b92e89a

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

+4 −2
Original line number Original line Diff line number Diff line
@@ -571,7 +571,8 @@ public class StageCoordinatorTests extends ShellTestCase { 
    }

    }





    @Test

    @Test

    @DisableFlags(Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND)

    @DisableFlags({Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND,

            Flags.FLAG_ENABLE_INPUT_LAYER_TRANSITION_FIX})

    public void testRequestEnterSplit_didNotEnterSplitSelect_doesNotApplyTransaction() {

    public void testRequestEnterSplit_didNotEnterSplitSelect_doesNotApplyTransaction() {

        final WindowContainerTransaction wct = new WindowContainerTransaction();

        final WindowContainerTransaction wct = new WindowContainerTransaction();

        mStageCoordinator.registerSplitSelectListener(

        mStageCoordinator.registerSplitSelectListener(
@@ -585,7 +586,8 @@ public class StageCoordinatorTests extends ShellTestCase { 
    }

    }





    @Test

    @Test

    @DisableFlags(Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND)

    @DisableFlags({Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND,

            Flags.FLAG_ENABLE_INPUT_LAYER_TRANSITION_FIX})

    public void testRequestEnterSplit_enteredSplitSelect_appliesTransaction() {

    public void testRequestEnterSplit_enteredSplitSelect_appliesTransaction() {

        final WindowContainerTransaction wct = new WindowContainerTransaction();

        final WindowContainerTransaction wct = new WindowContainerTransaction();

        mStageCoordinator.registerSplitSelectListener(

        mStageCoordinator.registerSplitSelectListener(