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

Commit 84cca5f8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Compatibilize ShowImeWhileDismissingThemedPopupDialogTest to CF ARM"... 

Merge "Compatibilize ShowImeWhileDismissingThemedPopupDialogTest to CF ARM" into udc-dev am: 8b5f53e9 am: 28317a75

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



Change-Id: I1290b155035799a2ec5cbca0f9e4cf39d1391bf4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8b35a464 28317a75

tests/FlickerTests/src/com/android/server/wm/flicker/ime/ShowImeWhileDismissingThemedPopupDialogTest.kt

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

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

class ShowImeWhileDismissingThemedPopupDialogTest(flicker: FlickerTest) : BaseTest(flicker) {

open class ShowImeWhileDismissingThemedPopupDialogTest(flicker: FlickerTest) : BaseTest(flicker) {

    private val testApp = ImeShownOnAppStartHelper(instrumentation, flicker.scenario.startRotation)



    /** {@inheritDoc} */

tests/FlickerTests/src/com/android/server/wm/flicker/ime/ShowImeWhileDismissingThemedPopupDialogTestCfArm.kt

0 → 100644
+48 −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.ime



import android.tools.common.Rotation

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



@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

class ShowImeWhileDismissingThemedPopupDialogTestCfArm(flicker: FlickerTest) :

    ShowImeWhileDismissingThemedPopupDialogTest(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> {

            return FlickerTestFactory.nonRotationTests(

                supportedRotations = listOf(Rotation.ROTATION_0)

            )

        }

    }

}
 
 No newline at end of file