Merge "Fix ExitPipWithDismissButtonTest#focusDoesNotChange" into tm-dev (4f18233f) · Commits · e / os / android_frameworks_base

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

+0 −11

Original line number	Diff line number	Diff line
		@@ -93,15 +93,4 @@ abstract class ExitPipTransition(testSpec: FlickerTestParameter) : PipTransition
		.isVisible(LAUNCHER_COMPONENT)
		}
		}

		/**
		* Checks that the focus doesn't change between windows during the transition
		*/
		@Presubmit
		@Test
		open fun focusDoesNotChange() {
		testSpec.assertEventLog {
		this.focusDoesNotChange()
		}
		}
		}

+11 −3

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package com.android.wm.shell.flicker.pip

		import android.platform.test.annotations.Presubmit
		import android.view.Surface
		import androidx.test.filters.FlakyTest
		import androidx.test.filters.RequiresDevice
		@@ -72,10 +73,17 @@ class ExitPipWithDismissButtonTest(testSpec: FlickerTestParameter) : ExitPipTran
		@Test
		override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales()

		/** {@inheritDoc} */
		@FlakyTest(bugId = 215869110)
		/**
		* Checks that the focus changes between the pip menu window and the launcher when clicking the
		* dismiss button on pip menu to close the pip window.
		*/
		@Presubmit
		@Test
		override fun focusDoesNotChange() = super.focusDoesNotChange()
		fun focusDoesNotChange() {
		testSpec.assertEventLog {
		this.focusChanges("PipMenuView", "NexusLauncherActivity")
		}
		}

		companion object {
		/**

+12 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package com.android.wm.shell.flicker.pip

		import android.platform.test.annotations.Presubmit
		import android.view.Surface
		import androidx.test.filters.FlakyTest
		import androidx.test.filters.RequiresDevice
		@@ -81,6 +82,17 @@ class ExitPipWithSwipeDownTest(testSpec: FlickerTestParameter) : ExitPipTransiti
		@Test
		override fun statusBarLayerRotatesScales() = testSpec.statusBarLayerRotatesScales()

		/**
		* Checks that the focus doesn't change between windows during the transition
		*/
		@Presubmit
		@Test
		fun focusDoesNotChange() {
		testSpec.assertEventLog {
		this.focusDoesNotChange()
		}
		}

		companion object {
		/**
		* Creates the test configurations.