diff options
| author | 2024-09-05 12:42:18 +0000 | |
|---|---|---|
| committer | 2024-09-05 12:42:18 +0000 | |
| commit | 2b865f36fba64e5c5f41659ae47bab46fa534c82 (patch) | |
| tree | 76147af07f104ff866adebd2093f189d71c091b5 | |
| parent | cf4a111306ed8e597bf4f4635778696dd70210f2 (diff) | |
| parent | 7268187b940f4ee83b130a145d9edd9bdac49ea6 (diff) | |
Merge "Set minimum width and height in flicker test to match the actual R.dimen.desktop_mode_minimum_window_width and R.dimen.desktop_mode_minimum_window_height" into main
| -rw-r--r-- | libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/src/com/android/wm/shell/flicker/DesktopModeFlickerScenarios.kt | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/src/com/android/wm/shell/flicker/DesktopModeFlickerScenarios.kt b/libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/src/com/android/wm/shell/flicker/DesktopModeFlickerScenarios.kt index 880e02140db1..f920ccd4e819 100644 --- a/libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/src/com/android/wm/shell/flicker/DesktopModeFlickerScenarios.kt +++ b/libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/src/com/android/wm/shell/flicker/DesktopModeFlickerScenarios.kt @@ -16,6 +16,8 @@ package com.android.wm.shell.flicker +import android.tools.PlatformConsts.DESKTOP_MODE_MINIMUM_WINDOW_HEIGHT +import android.tools.PlatformConsts.DESKTOP_MODE_MINIMUM_WINDOW_WIDTH import android.tools.flicker.AssertionInvocationGroup import android.tools.flicker.assertors.assertions.AppLayerIncreasesInSize import android.tools.flicker.assertors.assertions.AppLayerIsInvisibleAtEnd @@ -181,7 +183,13 @@ class DesktopModeFlickerScenarios { .build(), assertions = AssertionTemplates.DESKTOP_MODE_APP_VISIBILITY_ASSERTIONS + - listOf(AppWindowHasSizeOfAtLeast(DESKTOP_MODE_APP, 770, 700)) + listOf( + AppWindowHasSizeOfAtLeast( + DESKTOP_MODE_APP, + DESKTOP_MODE_MINIMUM_WINDOW_WIDTH, + DESKTOP_MODE_MINIMUM_WINDOW_HEIGHT + ) + ) .associateBy({ it }, { AssertionInvocationGroup.BLOCKING }), ) |