Merge "Fix EnterSplitScreenByDragFromAllApps in tablet" (13ce9677) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/CommonAssertions.kt

+6 −20

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@ package com.android.wm.shell.flicker
		import android.view.Surface
		import com.android.server.wm.flicker.FlickerTestParameter
		import com.android.server.wm.flicker.helpers.WindowUtils
		import com.android.server.wm.flicker.helpers.isShellTransitionsEnabled
		import com.android.server.wm.flicker.traces.layers.LayerTraceEntrySubject
		import com.android.server.wm.flicker.traces.layers.LayersTraceSubject
		import com.android.server.wm.traces.common.IComponentMatcher
		@@ -173,25 +172,12 @@ fun FlickerTestParameter.splitAppLayerBoundsBecomesVisibleByDrag(
		component: IComponentMatcher
		) {
		assertLayers {
		if (isShellTransitionsEnabled) {
		this.notContains(SPLIT_SCREEN_DIVIDER_COMPONENT.or(component), isOptional = true)
		.then()
		.isInvisible(SPLIT_SCREEN_DIVIDER_COMPONENT.or(component))
		.then()
		// TODO(b/245472831): Verify the component should snap to divider.
		.isVisible(component)
		} else {
		this.notContains(SPLIT_SCREEN_DIVIDER_COMPONENT.or(component), isOptional = true)
		.then()
		.isInvisible(SPLIT_SCREEN_DIVIDER_COMPONENT.or(component))
		.then()
		// TODO(b/245472831): Verify the component should snap to divider.
		.isVisible(component)
		.then()
		.isInvisible(component, isOptional = true)
		.then()
		.isVisible(component)
		}
		}
		}

+1 −20

Original line number	Diff line number	Diff line
		@@ -108,26 +108,7 @@ class EnterSplitScreenByDragFromAllApps(

		@Presubmit
		@Test
		fun secondaryAppLayerBecomesVisible() {
		Assume.assumeFalse(isShellTransitionsEnabled)
		testSpec.assertLayers {
		this.isInvisible(secondaryApp)
		.then()
		.isVisible(secondaryApp)
		.then()
		.isInvisible(secondaryApp)
		.then()
		.isVisible(secondaryApp)
		}
		}

		// TODO(b/245472831): Align to legacy transition after shell transition ready.
		@Presubmit
		@Test
		fun secondaryAppLayerBecomesVisible_ShellTransit() {
		Assume.assumeTrue(isShellTransitionsEnabled)
		testSpec.layerBecomesVisible(secondaryApp)
		}
		fun secondaryAppLayerBecomesVisible() = testSpec.layerBecomesVisible(secondaryApp)

		@Presubmit
		@Test