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

Commit f56881fa authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add activity state check to minimizeDesktopApp" into main

parents 75df0abc 3e51f9a3

tests/FlickerTests/test-apps/app-helpers/src/com/android/server/wm/flicker/helpers/DesktopModeAppHelper.kt

+5 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.graphics.Rect 
import android.graphics.Region

import android.os.SystemClock

import android.platform.uiautomatorhelpers.DeviceHelpers

import android.tools.PlatformConsts

import android.tools.device.apphelpers.IStandardAppHelper

import android.tools.helpers.SYSTEMUI_PACKAGE

import android.tools.traces.parsers.WindowManagerStateHelper
@@ -163,7 +164,10 @@ open class DesktopModeAppHelper(private val innerHelper: IStandardAppHelper) : 
            .StateSyncBuilder()

            .withAppTransitionIdle()

            .apply {

                if (isPip) withPipShown() else withWindowSurfaceDisappeared(innerHelper)

                if (isPip) withPipShown()

                else

                    withWindowSurfaceDisappeared(innerHelper)

                        .withActivityState(innerHelper, PlatformConsts.STATE_STOPPED)

            }

            .waitForAndVerify()

    }