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

Disable unfold animation stuff with shell transitions

Browse Source 
These need to be ported. Until that happens, we need to
disable them since the tests don't make sense with shell
transitions.

Bug: 204925795
Test: atest FullscreenTaskListenerTest StageTaskListenerTests
Change-Id: I81b140d01c6bc75cef310f0f15805c015febf999
This commit is contained in:
Evan Rosky
2021-11-02 15:21:51 -07:00
parent 587cdd132f
commit 3adbf23326
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/fullscreen/FullscreenTaskListenerTest.java
View File

@@ -18,6 +18,7 @@ package com.android.wm.shell.fullscreen;
import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD;
import static org.junit.Assume.assumeFalse;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.inOrder;
@@ -30,6 +31,7 @@ import android.app.ActivityManager.RunningTaskInfo;
import android.app.WindowConfiguration;
import android.content.res.Configuration;
import android.graphics.Point;
import android.os.SystemProperties;
import android.view.SurfaceControl;
import androidx.test.filters.SmallTest;
@@ -46,6 +48,8 @@ import java.util.Optional;
@SmallTest
public class FullscreenTaskListenerTest {
private static final boolean ENABLE_SHELL_TRANSITIONS =
SystemProperties.getBoolean("persist.debug.shell_transit", false);
@Mock
private SyncTransactionQueue mSyncQueue;
@@ -67,6 +71,7 @@ public class FullscreenTaskListenerTest {
@Test
public void testAnimatableTaskAppeared_notifiesUnfoldController() {
assumeFalse(ENABLE_SHELL_TRANSITIONS);
RunningTaskInfo info = createTaskInfo(/* visible */ true, /* taskId */ 0);
mListener.onTaskAppeared(info, mSurfaceControl);
@@ -76,6 +81,7 @@ public class FullscreenTaskListenerTest {
@Test
public void testMultipleAnimatableTasksAppeared_notifiesUnfoldController() {
assumeFalse(ENABLE_SHELL_TRANSITIONS);
RunningTaskInfo animatable1 = createTaskInfo(/* visible */ true, /* taskId */ 0);
RunningTaskInfo animatable2 = createTaskInfo(/* visible */ true, /* taskId */ 1);
@@ -89,6 +95,7 @@ public class FullscreenTaskListenerTest {
@Test
public void testNonAnimatableTaskAppeared_doesNotNotifyUnfoldController() {
assumeFalse(ENABLE_SHELL_TRANSITIONS);
RunningTaskInfo info = createTaskInfo(/* visible */ false, /* taskId */ 0);
mListener.onTaskAppeared(info, mSurfaceControl);
@@ -98,6 +105,7 @@ public class FullscreenTaskListenerTest {
@Test
public void testNonAnimatableTaskChanged_doesNotNotifyUnfoldController() {
assumeFalse(ENABLE_SHELL_TRANSITIONS);
RunningTaskInfo info = createTaskInfo(/* visible */ false, /* taskId */ 0);
mListener.onTaskAppeared(info, mSurfaceControl);
@@ -108,6 +116,7 @@ public class FullscreenTaskListenerTest {
@Test
public void testNonAnimatableTaskVanished_doesNotNotifyUnfoldController() {
assumeFalse(ENABLE_SHELL_TRANSITIONS);
RunningTaskInfo info = createTaskInfo(/* visible */ false, /* taskId */ 0);
mListener.onTaskAppeared(info, mSurfaceControl);
@@ -118,6 +127,7 @@ public class FullscreenTaskListenerTest {
@Test
public void testAnimatableTaskBecameInactive_notifiesUnfoldController() {
assumeFalse(ENABLE_SHELL_TRANSITIONS);
RunningTaskInfo animatableTask = createTaskInfo(/* visible */ true, /* taskId */ 0);
mListener.onTaskAppeared(animatableTask, mSurfaceControl);
RunningTaskInfo notAnimatableTask = createTaskInfo(/* visible */ false, /* taskId */ 0);
@@ -129,6 +139,7 @@ public class FullscreenTaskListenerTest {
@Test
public void testAnimatableTaskVanished_notifiesUnfoldController() {
assumeFalse(ENABLE_SHELL_TRANSITIONS);
RunningTaskInfo taskInfo = createTaskInfo(/* visible */ true, /* taskId */ 0);
mListener.onTaskAppeared(taskInfo, mSurfaceControl);

2
libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/StageTaskListenerTests.java
View File

@@ -132,6 +132,7 @@ public final class StageTaskListenerTests extends ShellTestCase {
@Test
public void testTaskAppeared_notifiesUnfoldListener() {
assumeFalse(ENABLE_SHELL_TRANSITIONS);
final ActivityManager.RunningTaskInfo task =
new TestRunningTaskInfoBuilder().setParentTaskId(mRootTask.taskId).build();
@@ -142,6 +143,7 @@ public final class StageTaskListenerTests extends ShellTestCase {
@Test
public void testTaskVanished_notifiesUnfoldListener() {
assumeFalse(ENABLE_SHELL_TRANSITIONS);
final ActivityManager.RunningTaskInfo task =
new TestRunningTaskInfoBuilder().setParentTaskId(mRootTask.taskId).build();
mStageTaskListener.onTaskAppeared(task, mSurfaceControl);