Merge "Update nav and status bar visibility checks on flicker" (745f56d3) · Commits · e / os / android_frameworks_base

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

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -86,8 +86,8 @@ class AppPairsTestCannotPairNonResizeableApps(

	@FlakyTest		@FlakyTest
	@Test		@Test
	override fun navBarLayerIsAlwaysVisible() {		override fun navBarLayerIsVisible() {
	super.navBarLayerIsAlwaysVisible()		super.navBarLayerIsVisible()
	}		}

	@Presubmit		@Presubmit

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

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -110,8 +110,8 @@ class AppPairsTestUnpairPrimaryAndSecondaryApps(

	@FlakyTest		@FlakyTest
	@Test		@Test
	override fun navBarLayerIsAlwaysVisible() {		override fun navBarLayerIsVisible() {
	super.navBarLayerIsAlwaysVisible()		super.navBarLayerIsVisible()
	}		}

	companion object {		companion object {

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

+12 −12

Original line number	Original line	Diff line number	Diff line
	@@ -30,14 +30,14 @@ import com.android.server.wm.flicker.endRotation
	import com.android.server.wm.flicker.helpers.isRotated		import com.android.server.wm.flicker.helpers.isRotated
	import com.android.server.wm.flicker.helpers.setRotation		import com.android.server.wm.flicker.helpers.setRotation
	import com.android.server.wm.flicker.helpers.wakeUpAndGoToHomeScreen		import com.android.server.wm.flicker.helpers.wakeUpAndGoToHomeScreen
	import com.android.server.wm.flicker.navBarLayerIsAlwaysVisible		import com.android.server.wm.flicker.navBarLayerIsVisible
	import com.android.server.wm.flicker.navBarLayerRotatesAndScales		import com.android.server.wm.flicker.navBarLayerRotatesAndScales
	import com.android.server.wm.flicker.navBarWindowIsAlwaysVisible		import com.android.server.wm.flicker.navBarWindowIsVisible
	import com.android.server.wm.flicker.repetitions		import com.android.server.wm.flicker.repetitions
	import com.android.server.wm.flicker.startRotation		import com.android.server.wm.flicker.startRotation
	import com.android.server.wm.flicker.statusBarLayerIsAlwaysVisible		import com.android.server.wm.flicker.statusBarLayerIsVisible
	import com.android.server.wm.flicker.statusBarLayerRotatesScales		import com.android.server.wm.flicker.statusBarLayerRotatesScales
	import com.android.server.wm.flicker.statusBarWindowIsAlwaysVisible		import com.android.server.wm.flicker.statusBarWindowIsVisible
	import com.android.wm.shell.flicker.helpers.AppPairsHelper		import com.android.wm.shell.flicker.helpers.AppPairsHelper
	import com.android.wm.shell.flicker.helpers.BaseAppHelper		import com.android.wm.shell.flicker.helpers.BaseAppHelper
	import com.android.wm.shell.flicker.helpers.MultiWindowHelper.Companion.getDevEnableNonResizableMultiWindow		import com.android.wm.shell.flicker.helpers.MultiWindowHelper.Companion.getDevEnableNonResizableMultiWindow
	@@ -154,26 +154,26 @@ abstract class AppPairsTransition(protected val testSpec: FlickerTestParameter)

	@FlakyTest(bugId = 186510496)		@FlakyTest(bugId = 186510496)
	@Test		@Test
	open fun navBarLayerIsAlwaysVisible() {		open fun navBarLayerIsVisible() {
	testSpec.navBarLayerIsAlwaysVisible()		testSpec.navBarLayerIsVisible()
	}		}

	@Presubmit		@Presubmit
	@Test		@Test
	open fun statusBarLayerIsAlwaysVisible() {		open fun statusBarLayerIsVisible() {
	testSpec.statusBarLayerIsAlwaysVisible()		testSpec.statusBarLayerIsVisible()
	}		}

	@Presubmit		@Presubmit
	@Test		@Test
	open fun navBarWindowIsAlwaysVisible() {		open fun navBarWindowIsVisible() {
	testSpec.navBarWindowIsAlwaysVisible()		testSpec.navBarWindowIsVisible()
	}		}

	@Presubmit		@Presubmit
	@Test		@Test
	open fun statusBarWindowIsAlwaysVisible() {		open fun statusBarWindowIsVisible() {
	testSpec.statusBarWindowIsAlwaysVisible()		testSpec.statusBarWindowIsVisible()
	}		}

	@Presubmit		@Presubmit

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

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -63,8 +63,8 @@ class RotateTwoLaunchedAppsInAppPairsMode(

	@FlakyTest		@FlakyTest
	@Test		@Test
	override fun statusBarLayerIsAlwaysVisible() {		override fun statusBarLayerIsVisible() {
	super.statusBarLayerIsAlwaysVisible()		super.statusBarLayerIsVisible()
	}		}

	@Presubmit		@Presubmit

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

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -27,8 +27,8 @@ import com.android.server.wm.flicker.annotation.Group1
	import com.android.server.wm.flicker.dsl.FlickerBuilder		import com.android.server.wm.flicker.dsl.FlickerBuilder
	import com.android.server.wm.flicker.endRotation		import com.android.server.wm.flicker.endRotation
	import com.android.server.wm.flicker.helpers.setRotation		import com.android.server.wm.flicker.helpers.setRotation
	import com.android.server.wm.flicker.navBarWindowIsAlwaysVisible		import com.android.server.wm.flicker.navBarWindowIsVisible
	import com.android.server.wm.flicker.statusBarWindowIsAlwaysVisible		import com.android.server.wm.flicker.statusBarWindowIsVisible
	import com.android.wm.shell.flicker.appPairsDividerIsVisible		import com.android.wm.shell.flicker.appPairsDividerIsVisible
	import com.android.wm.shell.flicker.appPairsPrimaryBoundsIsVisible		import com.android.wm.shell.flicker.appPairsPrimaryBoundsIsVisible
	import com.android.wm.shell.flicker.appPairsSecondaryBoundsIsVisible		import com.android.wm.shell.flicker.appPairsSecondaryBoundsIsVisible
	@@ -69,16 +69,16 @@ class RotateTwoLaunchedAppsRotateAndEnterAppPairsMode(

	@Presubmit		@Presubmit
	@Test		@Test
	override fun navBarWindowIsAlwaysVisible() = testSpec.navBarWindowIsAlwaysVisible()		override fun navBarWindowIsVisible() = super.navBarWindowIsVisible()

	@Presubmit		@Presubmit
	@Test		@Test
	override fun statusBarWindowIsAlwaysVisible() = testSpec.statusBarWindowIsAlwaysVisible()		override fun statusBarWindowIsVisible() = super.statusBarWindowIsVisible()

	@FlakyTest		@FlakyTest
	@Test		@Test
	override fun statusBarLayerIsAlwaysVisible() {		override fun statusBarLayerIsVisible() {
	super.statusBarLayerIsAlwaysVisible()		super.statusBarLayerIsVisible()
	}		}

	@Presubmit		@Presubmit