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

Commit 14e10ed1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix wait condition on quickswitch" into tm-dev am: 2abbbed2 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17002643

Change-Id: I3c306af49b2a388be3f6bb4db2d4a951b32d307f
parents ee2b07bd 2abbbed2

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 {