Merge "Enable Bubble flicker test with Shell transition" (b9728c63) · Commits · e / os / android_frameworks_base

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

+0 −9

Original line number	Diff line number	Diff line
		@@ -24,9 +24,6 @@ import com.android.server.wm.flicker.FlickerParametersRunnerFactory
		import com.android.server.wm.flicker.FlickerTestParameter
		import com.android.server.wm.flicker.annotation.Group4
		import com.android.server.wm.flicker.dsl.FlickerBuilder
		import com.android.wm.shell.flicker.helpers.BaseAppHelper
		import org.junit.Assume
		import org.junit.Before
		import org.junit.runner.RunWith
		import org.junit.Test
		import org.junit.runners.Parameterized
		@@ -62,12 +59,6 @@ class ExpandBubbleScreen(testSpec: FlickerTestParameter) : BaseBubbleScreen(test
		}
		}

		@Before
		fun setup() {
		// This test doesn't work in shell transitions because of b/205288792
		Assume.assumeFalse(BaseAppHelper.isShellTransitionsEnabled())
		}

		@Presubmit
		@Test
		fun testAppIsAlwaysVisible() {

+0 −9

Original line number	Diff line number	Diff line
		@@ -25,9 +25,6 @@ import com.android.server.wm.flicker.FlickerParametersRunnerFactory
		import com.android.server.wm.flicker.FlickerTestParameter
		import com.android.server.wm.flicker.annotation.Group4
		import com.android.server.wm.flicker.dsl.FlickerBuilder
		import com.android.wm.shell.flicker.helpers.BaseAppHelper
		import org.junit.Assume
		import org.junit.Before
		import org.junit.runner.RunWith
		import org.junit.Test
		import org.junit.runners.Parameterized
		@@ -70,12 +67,6 @@ class MultiBubblesScreen(testSpec: FlickerTestParameter) : BaseBubbleScreen(test
		}
		}

		@Before
		fun setup() {
		// This test doesn't work in shell transitions because of b/205288792
		Assume.assumeFalse(BaseAppHelper.isShellTransitionsEnabled())
		}

		@Presubmit
		@Test
		fun testAppIsAlwaysVisible() {