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

Commit 2b865f36 authored by Vania Desmonda's avatar Vania Desmonda Committed by Android (Google) Code Review
Browse files

Merge "Set minimum width and height in flicker test to match the actual... 

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
parents cf4a1113 7268187b

libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/src/com/android/wm/shell/flicker/DesktopModeFlickerScenarios.kt

+9 −1
Original line number Diff line number Diff line
@@ -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 }),

            )