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

Commit deb30096 authored by Nataniel Borges's avatar Nataniel Borges Committed by Automerger Merge Worker
Browse files

Merge "Add OpenAppColdFromIcon to CF ARM" into udc-dev am: 6c586942 

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



Change-Id: If6f574d6748e5bf19b45c43843363767bba5c370
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0e6e180d 6c586942

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

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ import org.junit.runners.Parameterized 
@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

class OpenAppColdFromIcon(flicker: FlickerTest) : OpenAppFromLauncherTransition(flicker) {

open class OpenAppColdFromIcon(flicker: FlickerTest) : OpenAppFromLauncherTransition(flicker) {

    /** {@inheritDoc} */

    override val transition: FlickerBuilder.() -> Unit

        get() = {

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

0 → 100644
+51 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.server.wm.flicker.launch



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

import android.tools.device.flicker.legacy.FlickerTestFactory

import org.junit.FixMethodOrder

import org.junit.runner.RunWith

import org.junit.runners.MethodSorters

import org.junit.runners.Parameterized



/** Some assertions will fail because of b/264415996 */

@FlickerServiceCompatible

@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

class OpenAppColdFromIconCfArm(flicker: FlickerTest) : OpenAppColdFromIcon(flicker) {

    companion object {

        /**

         * Creates the test configurations.

         *

         * See [FlickerTestFactory.nonRotationTests] for configuring screen orientation and

         * navigation modes.

         */

        @Parameterized.Parameters(name = "{0}")

        @JvmStatic

        fun getParams(): Collection<FlickerTest> {

            // TAPL fails on landscape mode b/240916028

            return FlickerTestFactory.nonRotationTests(

                    supportedNavigationModes = listOf(NavBar.MODE_3BUTTON)

            )

        }

    }

}