Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix UnfoldAnimationControllerTest" into tm-qpr-dev

Browse Source
This commit is contained in:
Hongwei Wang
2023-01-05 22:27:32 +00:00
committed by Android (Google) Code Review
parent 85dac5e1fb 381baa69d0
commit ef78f4d0fa
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -224,16 +224,18 @@ public class UnfoldAnimationControllerTest extends ShellTestCase {
mUnfoldAnimationController.onTaskAppeared(taskInfo, mLeash); mUnfoldAnimationController.onTaskAppeared(taskInfo, mLeash);
assertThat(mTaskAnimator1.mResetTasks).doesNotContain(taskInfo.taskId); assertThat(mTaskAnimator1.mResetTasks).doesNotContain(taskInfo.taskId);
mUnfoldAnimationController.onStateChangeStarted();
mUnfoldAnimationController.onTaskVanished(taskInfo); mUnfoldAnimationController.onTaskVanished(taskInfo);
mUnfoldAnimationController.onStateChangeFinished();
assertThat(mTaskAnimator1.mResetTasks).contains(taskInfo.taskId); assertThat(mTaskAnimator1.mResetTasks).contains(taskInfo.taskId);
} }
@Test @Test
public void testApplicablePinnedTaskDisappeared_doesNotResetSurface() { public void testApplicableTaskDisappeared_noStateChange_doesNotResetSurface() {
mTaskAnimator1.setTaskMatcher((info) -> info.getWindowingMode() == 2); mTaskAnimator1.setTaskMatcher((info) -> info.getWindowingMode() == 0);
RunningTaskInfo taskInfo = new TestRunningTaskInfoBuilder() RunningTaskInfo taskInfo = new TestRunningTaskInfoBuilder()
.setWindowingMode(2).build(); .setWindowingMode(0).build();
mUnfoldAnimationController.onTaskAppeared(taskInfo, mLeash); mUnfoldAnimationController.onTaskAppeared(taskInfo, mLeash);
assertThat(mTaskAnimator1.mResetTasks).doesNotContain(taskInfo.taskId); assertThat(mTaskAnimator1.mResetTasks).doesNotContain(taskInfo.taskId);
@@ -249,7 +251,9 @@ public class UnfoldAnimationControllerTest extends ShellTestCase {
.setWindowingMode(0).build(); .setWindowingMode(0).build();
mUnfoldAnimationController.onTaskAppeared(taskInfo, mLeash); mUnfoldAnimationController.onTaskAppeared(taskInfo, mLeash);
mUnfoldAnimationController.onStateChangeStarted();
mUnfoldAnimationController.onTaskVanished(taskInfo); mUnfoldAnimationController.onTaskVanished(taskInfo);
mUnfoldAnimationController.onStateChangeFinished();
assertThat(mTaskAnimator1.mResetTasks).doesNotContain(taskInfo.taskId); assertThat(mTaskAnimator1.mResetTasks).doesNotContain(taskInfo.taskId);
} }