Merge "Stabilize OpenAppFromOverviewTest test" (23b7b919) · Commits · e / os / android_frameworks_base

tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromOverviewTest.kt

+12 −4

Original line number	Diff line number	Diff line
		@@ -17,11 +17,13 @@
		package com.android.server.wm.flicker.launch

		import android.platform.test.annotations.Presubmit
		import android.view.Display
		import androidx.test.filters.FlakyTest
		import androidx.test.filters.RequiresDevice
		import com.android.server.wm.flicker.FlickerParametersRunnerFactory
		import com.android.server.wm.flicker.FlickerTestParameter
		import com.android.server.wm.flicker.FlickerTestParameterFactory
		import com.android.server.wm.flicker.LAUNCHER_COMPONENT
		import com.android.server.wm.flicker.annotation.Group1
		import com.android.server.wm.flicker.helpers.reopenAppFromOverview
		import com.android.server.wm.flicker.helpers.setRotation
		@@ -73,7 +75,12 @@ class OpenAppFromOverviewTest(testSpec: FlickerTestParameter) : OpenAppTransitio
		device.pressHome()
		wmHelper.waitForAppTransitionIdle()
		device.pressRecentApps()
		wmHelper.waitForAppTransitionIdle()
		wmHelper.waitFor(
		WindowManagerConditionsFactory
		.isAppTransitionIdle(Display.DEFAULT_DISPLAY),
		WindowManagerConditionsFactory.isActivityVisible(LAUNCHER_COMPONENT),
		WindowManagerConditionsFactory.hasLayersAnimating().negate()
		)
		this.setRotation(testSpec.config.startRotation)
		}
		}
		@@ -82,7 +89,8 @@ class OpenAppFromOverviewTest(testSpec: FlickerTestParameter) : OpenAppTransitio
		wmHelper.waitFor(
		WindowManagerConditionsFactory.hasLayersAnimating().negate(),
		WindowManagerConditionsFactory.isWMStateComplete(),
		WindowManagerConditionsFactory.isHomeActivityVisible().negate()
		WindowManagerConditionsFactory.isLayerVisible(LAUNCHER_COMPONENT).negate(),
		WindowManagerConditionsFactory.isActivityVisible(LAUNCHER_COMPONENT).negate()
		)
		wmHelper.waitForFullScreenApp(testApp.component)
		}