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

Commit 09212fcd authored by Nataniel Borges's avatar Nataniel Borges
Browse files

Fix wait condition on quickswitch 

The navbar vanishes and reappears during the transition. Wait until the navbar appears to consider the transition finished.

Bug: 219690120
Bug: 220083329
Test: atest WMShellFlickerTests
Change-Id: Ib4514872fa8e9c2eac4148095474d26255f4a712
parent 3a4774d2

tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchBetweenTwoAppsBackTest.kt

+1 −0
Original line number Original line Diff line number Diff line
@@ -104,6 +104,7 @@ open class QuickSwitchBetweenTwoAppsBackTest(private val testSpec: FlickerTestPa 




                wmHelper.waitForFullScreenApp(testApp1.component)

                wmHelper.waitForFullScreenApp(testApp1.component)

                wmHelper.waitForAppTransitionIdle()

                wmHelper.waitForAppTransitionIdle()

                wmHelper.waitForNavBarStatusBarVisible()

            }

            }





            teardown {

            teardown {

tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchBetweenTwoAppsForwardTest.kt

+3 −2
Original line number Original line Diff line number Diff line
@@ -116,12 +116,13 @@ open class QuickSwitchBetweenTwoAppsForwardTest(private val testSpec: FlickerTes 




                wmHelper.waitForFullScreenApp(testApp2.component)

                wmHelper.waitForFullScreenApp(testApp2.component)

                wmHelper.waitForAppTransitionIdle()

                wmHelper.waitForAppTransitionIdle()

                wmHelper.waitForNavBarStatusBarVisible()

            }

            }





            teardown {

            teardown {

                test {

                test {

                    testApp1.exit()

                    testApp1.exit(wmHelper)

                    testApp2.exit()

                    testApp2.exit(wmHelper)

                }

                }

            }

            }

        }

        }

tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchFromLauncherTest.kt

+1 −0
Original line number Original line Diff line number Diff line
@@ -91,6 +91,7 @@ class QuickSwitchFromLauncherTest(private val testSpec: FlickerTestParameter) { 




                wmHelper.waitForFullScreenApp(testApp.component)

                wmHelper.waitForFullScreenApp(testApp.component)

                wmHelper.waitForAppTransitionIdle()

                wmHelper.waitForAppTransitionIdle()

                wmHelper.waitForNavBarStatusBarVisible()

            }

            }





            teardown {

            teardown {