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

Commit bf8c214b authored by Hongwei Wang's avatar Hongwei Wang Committed by Automerger Merge Worker
Browse files

Merge "Fix UnfoldAnimationControllerTest" into tm-qpr-dev am: ef78f4d0 am: 2e46f7e4 

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



Change-Id: I99d2f14656e0cdf84664e8b7f607c3e5a98dfe43
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 86f39e6e 2e46f7e4

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/unfold/UnfoldAnimationControllerTest.java

+7 −3
Original line number Diff line number Diff line
@@ -224,16 +224,18 @@ public class UnfoldAnimationControllerTest extends ShellTestCase { 
        mUnfoldAnimationController.onTaskAppeared(taskInfo, mLeash);

        assertThat(mTaskAnimator1.mResetTasks).doesNotContain(taskInfo.taskId);



        mUnfoldAnimationController.onStateChangeStarted();

        mUnfoldAnimationController.onTaskVanished(taskInfo);

        mUnfoldAnimationController.onStateChangeFinished();



        assertThat(mTaskAnimator1.mResetTasks).contains(taskInfo.taskId);

    }



    @Test

    public void testApplicablePinnedTaskDisappeared_doesNotResetSurface() {

        mTaskAnimator1.setTaskMatcher((info) -> info.getWindowingMode() == 2);

    public void testApplicableTaskDisappeared_noStateChange_doesNotResetSurface() {

        mTaskAnimator1.setTaskMatcher((info) -> info.getWindowingMode() == 0);

        RunningTaskInfo taskInfo = new TestRunningTaskInfoBuilder()

                .setWindowingMode(2).build();

                .setWindowingMode(0).build();

        mUnfoldAnimationController.onTaskAppeared(taskInfo, mLeash);

        assertThat(mTaskAnimator1.mResetTasks).doesNotContain(taskInfo.taskId);
@@ -249,7 +251,9 @@ public class UnfoldAnimationControllerTest extends ShellTestCase { 
                .setWindowingMode(0).build();



        mUnfoldAnimationController.onTaskAppeared(taskInfo, mLeash);

        mUnfoldAnimationController.onStateChangeStarted();

        mUnfoldAnimationController.onTaskVanished(taskInfo);

        mUnfoldAnimationController.onStateChangeFinished();



        assertThat(mTaskAnimator1.mResetTasks).doesNotContain(taskInfo.taskId);

    }