Expect IME to use whole screen on landscape
On flame the IME is using the whole UI and the test app is not visible, when the phone is in landscape mode. Make the flicker tests compatible with this change. Bug: 176799414 Test: atest FlickerTests Change-Id: I52f18e4b6c1dc48758b833fbf4e11e80853effc2
This commit is contained in:
@@ -19,8 +19,21 @@ package com.android.server.wm.flicker.helpers
|
||||
import android.app.Instrumentation
|
||||
import androidx.test.uiautomator.UiDevice
|
||||
|
||||
class ImeAppAutoFocusHelper(instr: Instrumentation) : ImeAppHelper(instr, "ImeAppAutoFocus") {
|
||||
class ImeAppAutoFocusHelper @JvmOverloads constructor(
|
||||
instr: Instrumentation,
|
||||
private val rotation: Int,
|
||||
private val imePackageName: String = IME_PACKAGE
|
||||
) : ImeAppHelper(instr, "ImeAppAutoFocus") {
|
||||
override fun openIME(device: UiDevice) {
|
||||
// do nothing (the app is focused automatically)
|
||||
}
|
||||
|
||||
override fun open() {
|
||||
val expectedPackage = if (rotation.isRotated()) {
|
||||
imePackageName
|
||||
} else {
|
||||
packageName
|
||||
}
|
||||
launcherStrategy.launch(appName, expectedPackage)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -61,10 +61,11 @@ class CloseImeAutoOpenWindowToAppTest(
|
||||
@JvmStatic
|
||||
fun getParams(): List<Array<Any>> {
|
||||
val instrumentation = InstrumentationRegistry.getInstrumentation()
|
||||
val testApp = ImeAppAutoFocusHelper(instrumentation)
|
||||
|
||||
return FlickerTestRunnerFactory(instrumentation)
|
||||
.buildTest { configuration ->
|
||||
val testApp = ImeAppAutoFocusHelper(instrumentation,
|
||||
configuration.startRotation)
|
||||
withTag { buildTestTag("imeToAppAutoOpen", testApp, configuration) }
|
||||
repeat { configuration.repetitions }
|
||||
setup {
|
||||
|
||||
@@ -61,10 +61,11 @@ class CloseImeAutoOpenWindowToHomeTest(
|
||||
@JvmStatic
|
||||
fun getParams(): List<Array<Any>> {
|
||||
val instrumentation = InstrumentationRegistry.getInstrumentation()
|
||||
val testApp = ImeAppAutoFocusHelper(instrumentation)
|
||||
|
||||
return FlickerTestRunnerFactory(instrumentation)
|
||||
.buildTest { configuration ->
|
||||
val testApp = ImeAppAutoFocusHelper(instrumentation,
|
||||
configuration.startRotation)
|
||||
withTestName {
|
||||
buildTestTag("imeToHomeAutoOpen", testApp, configuration)
|
||||
}
|
||||
|
||||
@@ -66,11 +66,12 @@ class ReOpenImeWindowTest(
|
||||
@JvmStatic
|
||||
fun getParams(): List<Array<Any>> {
|
||||
val instrumentation = InstrumentationRegistry.getInstrumentation()
|
||||
val testApp = ImeAppAutoFocusHelper(instrumentation)
|
||||
val testAppComponentName = ActivityOptions.IME_ACTIVITY_AUTO_FOCUS_COMPONENT_NAME
|
||||
|
||||
return FlickerTestRunnerFactory(instrumentation, repetitions = 5)
|
||||
.buildTest { configuration ->
|
||||
val testApp = ImeAppAutoFocusHelper(instrumentation,
|
||||
configuration.startRotation)
|
||||
withTestName { buildTestTag("reOpenImeAutoFocus", testApp, configuration) }
|
||||
repeat { configuration.repetitions }
|
||||
setup {
|
||||
|
||||
Reference in New Issue
Block a user