From 04cf14cde2a23fbc2bffc348b476e6bfc930c544 Mon Sep 17 00:00:00 2001 From: Pablo Gamito Date: Wed, 26 Jul 2023 10:25:06 +0000 Subject: [PATCH 1/2] Remove accidentely kept @Presubmit annotation Bug: 292813143 Test: N/A Change-Id: I2421e2d31a65c938b94a7e432f5edfdd0cbde7a5 --- .../wm/shell/flicker/pip/MovePipDownOnShelfHeightChange.kt | 2 -- 1 file changed, 2 deletions(-) diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/MovePipDownOnShelfHeightChange.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/MovePipDownOnShelfHeightChange.kt index 2993af7df6001..13aa758ff1194 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/MovePipDownOnShelfHeightChange.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/MovePipDownOnShelfHeightChange.kt @@ -17,7 +17,6 @@ package com.android.wm.shell.flicker.pip import android.platform.test.annotations.FlakyTest -import android.platform.test.annotations.Presubmit import android.tools.device.flicker.junit.FlickerParametersRunnerFactory import android.tools.device.flicker.legacy.FlickerBuilder import android.tools.device.flicker.legacy.LegacyFlickerTest @@ -68,7 +67,6 @@ class MovePipDownOnShelfHeightChange(flicker: LegacyFlickerTest) : /** Checks that the visible region of [pipApp] layer always moves down during the animation. */ @FlakyTest(bugId = 292813143) - @Presubmit @Test fun pipLayerMovesDown() = pipLayerMoves(Direction.DOWN) } From ff2c76b3101b787ea4484fa40a28cd3d169dbb28 Mon Sep 17 00:00:00 2001 From: Pablo Gamito Date: Wed, 26 Jul 2023 10:34:29 +0000 Subject: [PATCH 2/2] Add missing @Test annotations Bug: 293075402 Test: N/A Change-Id: I3439a0968e9564924699bf820c6bec22efa36c9f --- .../layoutchange/HorizontalSplitChangeRatioTest.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/activityembedding/layoutchange/HorizontalSplitChangeRatioTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/activityembedding/layoutchange/HorizontalSplitChangeRatioTest.kt index 7457e80496635..d41840746cf90 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/activityembedding/layoutchange/HorizontalSplitChangeRatioTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/activityembedding/layoutchange/HorizontalSplitChangeRatioTest.kt @@ -67,9 +67,11 @@ class HorizontalSplitChangeRatioTest(flicker: LegacyFlickerTest) : } @FlakyTest(bugId = 293075402) + @Test override fun backgroundLayerNeverVisible() = super.backgroundLayerNeverVisible() @FlakyTest(bugId = 293075402) + @Test override fun visibleLayersShownMoreThanOneConsecutiveEntry() = super.visibleLayersShownMoreThanOneConsecutiveEntry()