From f2a82fa2ff35e058792ef827c1694bbc5e3f1030 Mon Sep 17 00:00:00 2001 From: Pablo Gamito Date: Mon, 24 Apr 2023 17:10:06 +0000 Subject: [PATCH] Run OpenAppColdFromIcon with gesture nav Bug: 240916028 Test: atest FlickerTests:OpenAppColdFromIcon Change-Id: I5fe719cdec309fb04e744833fe15f0664306339b --- .../android/server/wm/flicker/launch/OpenAppColdFromIcon.kt | 6 +----- .../server/wm/flicker/launch/OpenAppColdFromIconCfArm.kt | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdFromIcon.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdFromIcon.kt index 360a2336962c2..a658293c42949 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdFromIcon.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdFromIcon.kt @@ -16,7 +16,6 @@ package com.android.server.wm.flicker.launch -import android.tools.common.NavBar import android.tools.common.Rotation import android.tools.device.flicker.junit.FlickerParametersRunnerFactory import android.tools.device.flicker.legacy.FlickerBuilder @@ -87,10 +86,7 @@ open class OpenAppColdFromIcon(flicker: FlickerTest) : OpenAppFromLauncherTransi @Parameterized.Parameters(name = "{0}") @JvmStatic fun getParams(): Collection { - // TAPL fails on landscape mode b/240916028 - return FlickerTestFactory.nonRotationTests( - supportedNavigationModes = listOf(NavBar.MODE_3BUTTON) - ) + return FlickerTestFactory.nonRotationTests() } } } diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdFromIconCfArm.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdFromIconCfArm.kt index ccbe74f04a700..d33a2724ca44e 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdFromIconCfArm.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdFromIconCfArm.kt @@ -17,7 +17,6 @@ package com.android.server.wm.flicker.launch import android.platform.test.annotations.FlakyTest -import android.tools.common.NavBar import android.tools.device.flicker.annotation.FlickerServiceCompatible import android.tools.device.flicker.junit.FlickerParametersRunnerFactory import android.tools.device.flicker.legacy.FlickerTest @@ -50,10 +49,7 @@ class OpenAppColdFromIconCfArm(flicker: FlickerTest) : OpenAppColdFromIcon(flick @Parameterized.Parameters(name = "{0}") @JvmStatic fun getParams(): Collection { - // TAPL fails on landscape mode b/240916028 - return FlickerTestFactory.nonRotationTests( - supportedNavigationModes = listOf(NavBar.MODE_3BUTTON) - ) + return FlickerTestFactory.nonRotationTests() } } }