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

Commit af3b29c1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove app window bigger than initial bounds assertion." into main

parents ba67aa70 a660cee4

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

+0 −3
Original line number Original line Diff line number Diff line
@@ -36,7 +36,6 @@ import android.tools.flicker.assertors.assertions.AppWindowHasMaxDisplayHeight 
import android.tools.flicker.assertors.assertions.AppWindowHasMaxDisplayWidth

import android.tools.flicker.assertors.assertions.AppWindowHasMaxDisplayWidth

import android.tools.flicker.assertors.assertions.AppWindowHasSizeOfAtLeast

import android.tools.flicker.assertors.assertions.AppWindowHasSizeOfAtLeast

import android.tools.flicker.assertors.assertions.AppWindowInsideDisplayBoundsAtEnd

import android.tools.flicker.assertors.assertions.AppWindowInsideDisplayBoundsAtEnd

import android.tools.flicker.assertors.assertions.AppWindowIsBiggerThanInitialBoundsAtEnd

import android.tools.flicker.assertors.assertions.AppWindowIsInvisibleAtEnd

import android.tools.flicker.assertors.assertions.AppWindowIsInvisibleAtEnd

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

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

import android.tools.flicker.assertors.assertions.AppWindowMaintainsAspectRatioAlways

import android.tools.flicker.assertors.assertions.AppWindowMaintainsAspectRatioAlways
@@ -172,7 +171,6 @@ class DesktopModeFlickerScenarios { 
                assertions = AssertionTemplates.DESKTOP_MODE_APP_VISIBILITY_ASSERTIONS +

                assertions = AssertionTemplates.DESKTOP_MODE_APP_VISIBILITY_ASSERTIONS +

                        listOf(

                        listOf(

                            ResizeVeilKeepsIncreasingInSize(DESKTOP_MODE_APP),

                            ResizeVeilKeepsIncreasingInSize(DESKTOP_MODE_APP),

                            AppWindowIsBiggerThanInitialBoundsAtEnd(DESKTOP_MODE_APP),

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

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

                )

                )
@@ -189,7 +187,6 @@ class DesktopModeFlickerScenarios { 
                assertions = AssertionTemplates.DESKTOP_MODE_APP_VISIBILITY_ASSERTIONS +

                assertions = AssertionTemplates.DESKTOP_MODE_APP_VISIBILITY_ASSERTIONS +

                        listOf(

                        listOf(

                            ResizeVeilKeepsIncreasingInSize(DESKTOP_MODE_APP),

                            ResizeVeilKeepsIncreasingInSize(DESKTOP_MODE_APP),

                            AppWindowIsBiggerThanInitialBoundsAtEnd(DESKTOP_MODE_APP),

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

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

            )

            )