Merge "Fix OverrideTaskTransitionTest w/shell transitions" (616f3e72) · Commits · e / os / android_frameworks_base

tests/FlickerTests/res/anim/show_2000ms.xml→tests/FlickerTests/res/anim/show_hide_show_3000ms.xml

+15 −5

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="UTF-8"?>
		<!--
		~ Copyright (C) 2022 The Android Open Source Project
		~
		@@ -15,7 +14,18 @@
		~ limitations under the License.
		-->

		<translate xmlns:android="http://schemas.android.com/apk/res/android"
		android:duration="2000"
		android:fromXDelta="0"
		android:toXDelta="0" />
		No newline at end of file
		<set
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:fillAfter="true">

		<alpha
		android:fromAlpha="1.0"
		android:toAlpha="0.0"
		android:duration="1000" />

		<alpha
		android:startOffset="2000"
		android:fromAlpha="1.0"
		android:toAlpha="1.0"
		android:duration="1000" />
		</set>
		No newline at end of file

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

+18 −10

Original line number	Diff line number	Diff line
		@@ -30,13 +30,11 @@ import com.android.server.wm.flicker.R
		import com.android.server.wm.flicker.dsl.FlickerBuilder
		import com.android.server.wm.flicker.helpers.SimpleAppHelper
		import com.android.server.wm.flicker.helpers.StandardAppHelper
		import com.android.server.wm.flicker.helpers.isShellTransitionsEnabled
		import com.android.server.wm.flicker.helpers.setRotation
		import com.android.server.wm.flicker.helpers.wakeUpAndGoToHomeScreen
		import com.android.server.wm.flicker.rules.RemoveAllTasksButHomeRule
		import com.android.server.wm.traces.common.ComponentNameMatcher
		import com.android.server.wm.traces.common.WindowManagerConditionsFactory
		import org.junit.Assume
		import org.junit.FixMethodOrder
		import org.junit.Test
		import org.junit.runner.RunWith
		@@ -50,7 +48,7 @@ import org.junit.runners.Parameterized
		*
		* Actions:
		* ```
		* Launches SimpleActivity with alpha_2000ms animation
		* Launches SimpleActivity with a special animation.
		* ```
		*/
		@RequiresDevice
		@@ -89,21 +87,31 @@ class OverrideTaskTransitionTest(val testSpec: FlickerTestParameter) {
		@Presubmit
		@Test
		fun testSimpleActivityIsShownDirectly() {
		Assume.assumeFalse(isShellTransitionsEnabled)
		testSpec.assertLayers {
		// Before the app launches, only the launcher is visible.
		isVisible(ComponentNameMatcher.LAUNCHER)
		.isInvisible(ComponentNameMatcher.SPLASH_SCREEN)
		.isInvisible(testApp)
		.then()
		// The custom animation should block the entire launcher from the very beginning
		.isInvisible(ComponentNameMatcher.LAUNCHER)
		// Animation starts, but the app may not be drawn yet which means the Splash
		// may be visible.
		.isInvisible(testApp, isOptional = true)
		.isVisible(ComponentNameMatcher.SPLASH_SCREEN, isOptional = true)
		.then()
		// App shows up with the custom animation starting at alpha=1.
		.isVisible(testApp)
		.then()
		// App custom animation continues to alpha=0 (invisible).
		.isInvisible(testApp)
		.then()
		// App custom animation ends with it being visible.
		.isVisible(testApp)
		}
		}

		private fun createCustomTaskAnimation(): Bundle {
		return android.app.ActivityOptions.makeCustomTaskAnimation(
		instrumentation.context,
		R.anim.show_2000ms,
		R.anim.show_hide_show_3000ms,
		0,
		Handler.getMain(),
		null,