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

Commit abf5bd1e authored by Yuichiro Hanada's avatar Yuichiro Hanada Committed by Android (Google) Code Review
Browse files

Merge "Do not assert VisibleLayersShownMoreThanOneConsecutiveEntry for minimization" into main

parents 709131d2 179dc5ec

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

+7 −2
Original line number Original line Diff line number Diff line
@@ -44,6 +44,7 @@ import android.tools.flicker.assertors.assertions.AppWindowOnTopAtStart 
import android.tools.flicker.assertors.assertions.AppWindowRemainInsideDisplayBounds

import android.tools.flicker.assertors.assertions.AppWindowRemainInsideDisplayBounds

import android.tools.flicker.assertors.assertions.AppWindowReturnsToStartBoundsAndPosition

import android.tools.flicker.assertors.assertions.AppWindowReturnsToStartBoundsAndPosition

import android.tools.flicker.assertors.assertions.LauncherWindowReplacesAppAsTopWindow

import android.tools.flicker.assertors.assertions.LauncherWindowReplacesAppAsTopWindow

import android.tools.flicker.assertors.assertions.VisibleLayersShownMoreThanOneConsecutiveEntry

import android.tools.flicker.config.AssertionTemplates

import android.tools.flicker.config.AssertionTemplates

import android.tools.flicker.config.FlickerConfigEntry

import android.tools.flicker.config.FlickerConfigEntry

import android.tools.flicker.config.ScenarioId

import android.tools.flicker.config.ScenarioId
@@ -463,7 +464,9 @@ class DesktopModeFlickerScenarios { 
                    }

                    }

                ),

                ),

                assertions =

                assertions =

                AssertionTemplates.COMMON_ASSERTIONS +

                    AssertionTemplates.COMMON_ASSERTIONS.toMutableMap().also {

                        it.remove(VisibleLayersShownMoreThanOneConsecutiveEntry())

                    } +

                    listOf(

                    listOf(

                        AppWindowOnTopAtStart(DESKTOP_MODE_APP),

                        AppWindowOnTopAtStart(DESKTOP_MODE_APP),

                        AppWindowBecomesInvisible(DESKTOP_MODE_APP),

                        AppWindowBecomesInvisible(DESKTOP_MODE_APP),
@@ -489,7 +492,9 @@ class DesktopModeFlickerScenarios { 
                    }

                    }

                ),

                ),

                assertions =

                assertions =

                AssertionTemplates.COMMON_ASSERTIONS +

                    AssertionTemplates.COMMON_ASSERTIONS.toMutableMap().also {

                        it.remove(VisibleLayersShownMoreThanOneConsecutiveEntry())

                    } +

                    listOf(

                    listOf(

                        AppWindowOnTopAtStart(DESKTOP_MODE_APP),

                        AppWindowOnTopAtStart(DESKTOP_MODE_APP),

                        AppWindowBecomesInvisible(DESKTOP_MODE_APP),

                        AppWindowBecomesInvisible(DESKTOP_MODE_APP),