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

Commit 6e367531 authored by Pablo Gamito's avatar Pablo Gamito Committed by Automerger Merge Worker
Browse files

Merge "Run OpenAppColdFromIcon with gesture nav" into udc-dev am: 820fe847 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22814563



Change-Id: I8af89298a8fafa241d40dacfadc2e905c865c030
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 525f66fa 820fe847

tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdFromIcon.kt

+1 −5
Original line number Diff line number Diff line
@@ -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<FlickerTest> {

            // TAPL fails on landscape mode b/240916028

            return FlickerTestFactory.nonRotationTests(

                supportedNavigationModes = listOf(NavBar.MODE_3BUTTON)

            )

            return FlickerTestFactory.nonRotationTests()

        }

    }

}

tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdFromIconCfArm.kt

+1 −5
Original line number Diff line number Diff line
@@ -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<FlickerTest> {

            // TAPL fails on landscape mode b/240916028

            return FlickerTestFactory.nonRotationTests(

                supportedNavigationModes = listOf(NavBar.MODE_3BUTTON)

            )

            return FlickerTestFactory.nonRotationTests()

        }

    }

}