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

Commit 0fd4abe6 authored by Orhan Uysal's avatar Orhan Uysal Committed by Android (Google) Code Review
Browse files

Merge "Check for window visibility instead of layer" into main

parents b2b0c3af 5269759a

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

+2 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.tools.flicker.assertors.assertions.AppLayerIsInvisibleAtEnd 
import android.tools.flicker.assertors.assertions.AppLayerIsVisibleAlways

import android.tools.flicker.assertors.assertions.AppLayerIsVisibleAtStart

import android.tools.flicker.assertors.assertions.AppWindowHasDesktopModeInitialBoundsAtTheEnd

import android.tools.flicker.assertors.assertions.AppWindowIsVisibleAlways

import android.tools.flicker.assertors.assertions.AppWindowOnTopAtEnd

import android.tools.flicker.assertors.assertions.AppWindowOnTopAtStart

import android.tools.flicker.assertors.assertions.AppWindowRemainInsideDisplayBounds
@@ -133,9 +134,8 @@ class DesktopModeFlickerScenarios { 
                    }

                ),

                assertions =

                AssertionTemplates.COMMON_ASSERTIONS +

                        listOf(

                            AppLayerIsVisibleAlways(Components.DESKTOP_MODE_APP),

                            AppWindowIsVisibleAlways(Components.DESKTOP_MODE_APP),

                            AppWindowOnTopAtEnd(Components.DESKTOP_MODE_APP),

                            AppWindowRemainInsideDisplayBounds(Components.DESKTOP_MODE_APP),

                        ).associateBy({ it }, { AssertionInvocationGroup.BLOCKING }),