From cb5b18e8478ad547a96e9fa73b401c14ef70b30e Mon Sep 17 00:00:00 2001 From: Orhan Uysal Date: Fri, 3 May 2024 13:07:51 +0000 Subject: Make desktop tests run only on tablets. Bug: 338179980 Test: None Change-Id: Ia335a352ff705bea18a6589f84bfdd8786aac49b --- .../service/desktopmode/scenarios/CloseAllAppsWithAppHeaderExit.kt | 2 +- .../shell/flicker/service/desktopmode/scenarios/EnterDesktopWithDrag.kt | 2 +- .../flicker/service/desktopmode/scenarios/ResizeAppWithCornerResize.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/WindowManager/Shell/tests/flicker/service/src/com/android/wm/shell/flicker/service/desktopmode/scenarios/CloseAllAppsWithAppHeaderExit.kt b/libs/WindowManager/Shell/tests/flicker/service/src/com/android/wm/shell/flicker/service/desktopmode/scenarios/CloseAllAppsWithAppHeaderExit.kt index 0c2b5015840d..e77a45729124 100644 --- a/libs/WindowManager/Shell/tests/flicker/service/src/com/android/wm/shell/flicker/service/desktopmode/scenarios/CloseAllAppsWithAppHeaderExit.kt +++ b/libs/WindowManager/Shell/tests/flicker/service/src/com/android/wm/shell/flicker/service/desktopmode/scenarios/CloseAllAppsWithAppHeaderExit.kt @@ -55,7 +55,7 @@ constructor(val rotation: Rotation = Rotation.ROTATION_0) { @Before fun setup() { - Assume.assumeTrue(Flags.enableDesktopWindowingMode()) + Assume.assumeTrue(Flags.enableDesktopWindowingMode() && tapl.isTablet) tapl.setEnableRotation(true) tapl.setExpectedRotation(rotation.value) testApp.enterDesktopWithDrag(wmHelper, device) diff --git a/libs/WindowManager/Shell/tests/flicker/service/src/com/android/wm/shell/flicker/service/desktopmode/scenarios/EnterDesktopWithDrag.kt b/libs/WindowManager/Shell/tests/flicker/service/src/com/android/wm/shell/flicker/service/desktopmode/scenarios/EnterDesktopWithDrag.kt index 9e9998ef7c2a..fe139d2d24a0 100644 --- a/libs/WindowManager/Shell/tests/flicker/service/src/com/android/wm/shell/flicker/service/desktopmode/scenarios/EnterDesktopWithDrag.kt +++ b/libs/WindowManager/Shell/tests/flicker/service/src/com/android/wm/shell/flicker/service/desktopmode/scenarios/EnterDesktopWithDrag.kt @@ -50,7 +50,7 @@ constructor(val rotation: Rotation = Rotation.ROTATION_0) { @Before fun setup() { - Assume.assumeTrue(Flags.enableDesktopWindowingMode()) + Assume.assumeTrue(Flags.enableDesktopWindowingMode() && tapl.isTablet) tapl.setEnableRotation(true) tapl.setExpectedRotation(rotation.value) } diff --git a/libs/WindowManager/Shell/tests/flicker/service/src/com/android/wm/shell/flicker/service/desktopmode/scenarios/ResizeAppWithCornerResize.kt b/libs/WindowManager/Shell/tests/flicker/service/src/com/android/wm/shell/flicker/service/desktopmode/scenarios/ResizeAppWithCornerResize.kt index 289ca9f5d92e..ac9089a5c1bd 100644 --- a/libs/WindowManager/Shell/tests/flicker/service/src/com/android/wm/shell/flicker/service/desktopmode/scenarios/ResizeAppWithCornerResize.kt +++ b/libs/WindowManager/Shell/tests/flicker/service/src/com/android/wm/shell/flicker/service/desktopmode/scenarios/ResizeAppWithCornerResize.kt @@ -50,7 +50,7 @@ constructor(val rotation: Rotation = Rotation.ROTATION_0) { @Before fun setup() { - Assume.assumeTrue(Flags.enableDesktopWindowingMode()) + Assume.assumeTrue(Flags.enableDesktopWindowingMode() && tapl.isTablet) tapl.setEnableRotation(true) tapl.setExpectedRotation(rotation.value) testApp.enterDesktopWithDrag(wmHelper, device) -- cgit v1.2.3-59-g8ed1b