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

Commit bde2afa8 authored by Pablo Gamito's avatar Pablo Gamito Committed by Android (Google) Code Review
Browse files

Merge "Check for stopped state after launching AlwaysExpandActivity over the... 

Merge "Check for stopped state after launching AlwaysExpandActivity over the main activity in addition to paused" into main
parents 57b63f6a 3249255e

tests/FlickerTests/src/com/android/server/wm/flicker/helpers/ActivityEmbeddingAppHelper.kt

+5 −2
Original line number Diff line number Diff line
@@ -171,12 +171,15 @@ constructor( 
        wmHelper

            .StateSyncBuilder()

            .withActivityState(ALWAYS_EXPAND_ACTIVITY_COMPONENT, PlatformConsts.STATE_RESUMED)

            .withActivityState(MAIN_ACTIVITY_COMPONENT, PlatformConsts.STATE_PAUSED)

            .withActivityState(MAIN_ACTIVITY_COMPONENT, PlatformConsts.STATE_PAUSED,

                PlatformConsts.STATE_STOPPED)

            .waitForAndVerify()

    }



    private fun launchSecondaryActivityFromButton(

            wmHelper: WindowManagerStateHelper, buttonName: String) {

        wmHelper: WindowManagerStateHelper,

        buttonName: String

    ) {

        val launchButton =

                uiDevice.wait(Until.findObject(By.res(getPackage(), buttonName)), FIND_TIMEOUT)

        require(launchButton != null) {