summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Nataniel Borges <natanieljr@google.com> 2024-04-29 13:08:40 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-04-29 13:08:40 +0000
commitd94136d8485e6193079568603c598ff25f95168a (patch)
tree16add4530a1c4356a15bf274de3bce71c69adcea
parent8c28d170753a950315513066009d2a8d7566cb9d (diff)
parent4505361d9c8da663234ea64dfc449f34bf876db6 (diff)
Merge "Check taskbar is transient before unstashing" into main
-rw-r--r--tests/FlickerTests/IME/src/com/android/server/wm/flicker/ime/ShowImeOnAppStartWhenLaunchingAppFromOverviewTest.kt2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/FlickerTests/IME/src/com/android/server/wm/flicker/ime/ShowImeOnAppStartWhenLaunchingAppFromOverviewTest.kt b/tests/FlickerTests/IME/src/com/android/server/wm/flicker/ime/ShowImeOnAppStartWhenLaunchingAppFromOverviewTest.kt
index 063088d54b45..03f3a68a573f 100644
--- a/tests/FlickerTests/IME/src/com/android/server/wm/flicker/ime/ShowImeOnAppStartWhenLaunchingAppFromOverviewTest.kt
+++ b/tests/FlickerTests/IME/src/com/android/server/wm/flicker/ime/ShowImeOnAppStartWhenLaunchingAppFromOverviewTest.kt
@@ -50,7 +50,7 @@ class ShowImeOnAppStartWhenLaunchingAppFromOverviewTest(flicker: LegacyFlickerTe
testApp.launchViaIntent(wmHelper)
testApp.openIME(wmHelper)
this.setRotation(flicker.scenario.startRotation)
- if (flicker.scenario.isTablet) {
+ if (flicker.scenario.isTablet && tapl.isTransientTaskbar()) {
tapl.launchedAppState.swipeUpToUnstashTaskbar()
}
tapl.launchedAppState.switchToOverview()