diff options
3 files changed, 21 insertions, 1 deletions
diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/UnlockKeyguardToSplitScreen.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/UnlockKeyguardToSplitScreen.kt index 851391d37323..10dceba3d680 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/UnlockKeyguardToSplitScreen.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/UnlockKeyguardToSplitScreen.kt @@ -16,9 +16,13 @@ package com.android.wm.shell.flicker.splitscreen +import android.platform.test.annotations.FlakyTest import android.platform.test.annotations.Postsubmit +import android.platform.test.annotations.Presubmit import android.tools.common.NavBar +import android.tools.common.flicker.subject.layers.LayersTraceSubject import android.tools.common.flicker.subject.region.RegionSubject +import android.tools.common.traces.component.ComponentNameMatcher.Companion.WALLPAPER_BBQ_WRAPPER import android.tools.device.flicker.junit.FlickerParametersRunnerFactory import android.tools.device.flicker.legacy.FlickerBuilder import android.tools.device.flicker.legacy.LegacyFlickerTest @@ -57,6 +61,21 @@ class UnlockKeyguardToSplitScreen(override val flicker: LegacyFlickerTest) : } @Test + @FlakyTest(bugId = 293578017) + override fun visibleLayersShownMoreThanOneConsecutiveEntry() = + super.visibleLayersShownMoreThanOneConsecutiveEntry() + + // TODO(b/293578017) remove once that bug is resolve + @Test + @Presubmit + fun visibleLayersShownMoreThanOneConsecutiveEntry_withoutWallpaper() = + flicker.assertLayers { this.visibleLayersShownMoreThanOneConsecutiveEntry( + LayersTraceSubject.VISIBLE_FOR_MORE_THAN_ONE_ENTRY_IGNORE_LAYERS + listOf( + WALLPAPER_BBQ_WRAPPER + ) + ) } + + @Test fun splitScreenDividerIsVisibleAtEnd() { flicker.assertLayersEnd { this.isVisible(SPLIT_SCREEN_DIVIDER_COMPONENT) } } diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/utils/CommonAssertions.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/utils/CommonAssertions.kt index e5c124cbe775..f1cb37ee1293 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/utils/CommonAssertions.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/utils/CommonAssertions.kt @@ -265,6 +265,7 @@ fun LayerTraceEntrySubject.splitAppLayerBoundsSnapToDivider( val dividerRegion = layer(SPLIT_SCREEN_DIVIDER_COMPONENT)?.visibleRegion?.region ?: error("$SPLIT_SCREEN_DIVIDER_COMPONENT component not found") + visibleRegion(component).isNotEmpty() visibleRegion(component) .coversAtMost( if (displayBounds.width > displayBounds.height) { diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockscreenViaIntentTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockscreenViaIntentTest.kt index 063e2c3091ca..e0fb751dcf7d 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockscreenViaIntentTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockscreenViaIntentTest.kt @@ -93,7 +93,7 @@ open class OpenAppFromLockscreenViaIntentTest(flicker: LegacyFlickerTest) : * Checks that the [ComponentNameMatcher.NAV_BAR] starts the transition invisible, then becomes * visible during the unlocking animation and remains visible at the end of the transition */ - @Presubmit + @FlakyTest(bugId = 293581770) @Test fun navBarWindowsVisibilityChanges() { Assume.assumeFalse(flicker.scenario.isTablet) |