Scroll to find the expected mode
A new OOB mode has been created, so it's not necessary to find the mode
the tests create
Test: ModesDialog
Flag: EXEMPT test only
Fixes: 430045228
Change-Id: I8045d23a09acff1116178c2aa8efc551d5f08216
diff --git a/libraries/systemui-tapl/src/android/platform/systemui_tapl/ui/ModesDialog.kt b/libraries/systemui-tapl/src/android/platform/systemui_tapl/ui/ModesDialog.kt
index 01d232a..97f5865 100644
--- a/libraries/systemui-tapl/src/android/platform/systemui_tapl/ui/ModesDialog.kt
+++ b/libraries/systemui-tapl/src/android/platform/systemui_tapl/ui/ModesDialog.kt
@@ -15,8 +15,10 @@
*/
package android.platform.systemui_tapl.ui
+import android.platform.systemui_tapl.utils.DeviceUtils
import android.platform.uiautomatorhelpers.DeviceHelpers.assertInvisible
import android.platform.uiautomatorhelpers.DeviceHelpers.assertVisible
+import android.platform.uiautomatorhelpers.scrollUntilFound
import android.platform.uiautomatorhelpers.DeviceHelpers.waitForObj
import android.view.Display.DEFAULT_DISPLAY
import androidx.test.uiautomator.By
@@ -42,7 +44,12 @@
}
private fun getModeTile(modeName: String): UiObject2 {
- return waitForObj(By.text(modeName)).parent
+ val scrollView: UiObject2 =
+ waitForObj(
+ DeviceUtils.sysuiResSelector("scroll_view", displayId)
+ )
+ val tile = scrollView.scrollUntilFound(By.text(modeName)) ?: error("Mode tile $modeName not found")
+ return tile.parent
}
fun tapMode(modeName: String) {
