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

Commit 2d0d9366 authored by Felix Stern's avatar Felix Stern Committed by Android (Google) Code Review
Browse files

Merge "Fix IME flicker test in split screen when no layer change was applied" into main

parents 0166970a 0428a7e9

libs/WindowManager/Shell/tests/flicker/splitscreen/src/com/android/wm/shell/flicker/splitscreen/MultipleShowImeRequestsInSplitScreen.kt

+19 −5
Original line number Original line Diff line number Diff line
@@ -17,11 +17,13 @@ 
package com.android.wm.shell.flicker.splitscreen

package com.android.wm.shell.flicker.splitscreen





import android.platform.test.annotations.Presubmit

import android.platform.test.annotations.Presubmit

import android.tools.NavBar

import android.tools.Rotation

import android.tools.Rotation

import android.tools.ScenarioBuilder

import android.tools.flicker.junit.FlickerParametersRunnerFactory

import android.tools.flicker.junit.FlickerParametersRunnerFactory

import android.tools.flicker.legacy.FlickerBuilder

import android.tools.flicker.legacy.FlickerBuilder

import android.tools.flicker.legacy.LegacyFlickerTest

import android.tools.flicker.legacy.LegacyFlickerTest

import android.tools.flicker.legacy.LegacyFlickerTestFactory

import android.tools.traces.SERVICE_TRACE_CONFIG

import android.tools.traces.component.ComponentNameMatcher

import android.tools.traces.component.ComponentNameMatcher

import androidx.test.filters.RequiresDevice

import androidx.test.filters.RequiresDevice

import com.android.wm.shell.flicker.splitscreen.benchmark.MultipleShowImeRequestsInSplitScreenBenchmark

import com.android.wm.shell.flicker.splitscreen.benchmark.MultipleShowImeRequestsInSplitScreenBenchmark
@@ -35,7 +37,7 @@ import org.junit.runners.Parameterized 
/**

/**

 * Test quick switch between two split pairs.

 * Test quick switch between two split pairs.

 *

 *

 * To run this test: `atest WMShellFlickerTestsSplitScreenGroup2:MultipleShowImeRequestsInSplitScreen`

 * To run this test: `atest WMShellFlickerTestsSplitScreenGroupOther:MultipleShowImeRequestsInSplitScreen`

 */

 */

@RequiresDevice

@RequiresDevice

@RunWith(Parameterized::class)

@RunWith(Parameterized::class)
@@ -58,10 +60,22 @@ class MultipleShowImeRequestsInSplitScreen(override val flicker: LegacyFlickerTe 
            }

            }





    companion object {

    companion object {

        private fun createFlickerTest(

            navBarMode: NavBar

        ) = LegacyFlickerTest(ScenarioBuilder()

            .withStartRotation(Rotation.ROTATION_0)

            .withEndRotation(Rotation.ROTATION_0)

            .withNavBarMode(navBarMode), resultReaderProvider = { scenario ->

            android.tools.flicker.datastore.CachedResultReader(

                scenario, SERVICE_TRACE_CONFIG

            )

        })



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

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

        @JvmStatic

        @JvmStatic

        fun getParams() = LegacyFlickerTestFactory.nonRotationTests(

        fun getParams() = listOf(

                supportedRotations = listOf(Rotation.ROTATION_0)

            createFlickerTest(NavBar.MODE_GESTURAL),

            createFlickerTest(NavBar.MODE_3BUTTON)

        )

        )

    }

    }

}
 
}
 
 No newline at end of file