Merge "Fix wrong split bounds in legacy split flicker tests" into sc-dev (68667bdd) · Commits · e / os / android_frameworks_base

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

+7 −10

Original line number	Original line	Diff line number	Diff line
	@@ -115,23 +115,20 @@ fun getPrimaryRegion(dividerRegion: Region, rotation: Int): Region {
	val displayBounds = WindowUtils.getDisplayBounds(rotation)		val displayBounds = WindowUtils.getDisplayBounds(rotation)
	return if (rotation == Surface.ROTATION_0 \|\| rotation == Surface.ROTATION_180) {		return if (rotation == Surface.ROTATION_0 \|\| rotation == Surface.ROTATION_180) {
	Region(0, 0, displayBounds.bounds.right,		Region(0, 0, displayBounds.bounds.right,
	dividerRegion.bounds.bottom - WindowUtils.dockedStackDividerInset)		dividerRegion.bounds.top + WindowUtils.dockedStackDividerInset)
	} else {		} else {
	Region(0, 0, dividerRegion.bounds.left,		Region(0, 0, dividerRegion.bounds.left + WindowUtils.dockedStackDividerInset,
	dividerRegion.bounds.right - WindowUtils.dockedStackDividerInset)		displayBounds.bounds.bottom)
	}		}
	}		}

	fun getSecondaryRegion(dividerRegion: Region, rotation: Int): Region {		fun getSecondaryRegion(dividerRegion: Region, rotation: Int): Region {
	val displayBounds = WindowUtils.getDisplayBounds(rotation)		val displayBounds = WindowUtils.getDisplayBounds(rotation)
	return if (rotation == Surface.ROTATION_0 \|\| rotation == Surface.ROTATION_180) {		return if (rotation == Surface.ROTATION_0 \|\| rotation == Surface.ROTATION_180) {
	Region(0,		Region(0, dividerRegion.bounds.bottom - WindowUtils.dockedStackDividerInset,
	dividerRegion.bounds.bottom - WindowUtils.dockedStackDividerInset,		displayBounds.bounds.right, displayBounds.bounds.bottom)
	displayBounds.bounds.right,
	displayBounds.bounds.bottom - WindowUtils.dockedStackDividerInset)
	} else {		} else {
	Region(dividerRegion.bounds.right, 0,		Region(dividerRegion.bounds.right - WindowUtils.dockedStackDividerInset, 0,
	displayBounds.bounds.right,		displayBounds.bounds.right, displayBounds.bounds.bottom)
	displayBounds.bounds.bottom - WindowUtils.dockedStackDividerInset)
	}		}
	}		}
			No newline at end of file

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

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -18,7 +18,6 @@ package com.android.wm.shell.flicker.legacysplitscreen

	import android.platform.test.annotations.Presubmit		import android.platform.test.annotations.Presubmit
	import android.view.Surface		import android.view.Surface
	import androidx.test.filters.FlakyTest
	import androidx.test.filters.RequiresDevice		import androidx.test.filters.RequiresDevice
	import com.android.server.wm.flicker.FlickerParametersRunnerFactory		import com.android.server.wm.flicker.FlickerParametersRunnerFactory
	import com.android.server.wm.flicker.FlickerTestParameter		import com.android.server.wm.flicker.FlickerTestParameter
	@@ -64,7 +63,7 @@ class EnterSplitScreenDockActivity(
	splitScreenApp.defaultWindowName, WindowManagerStateHelper.SPLASH_SCREEN_NAME,		splitScreenApp.defaultWindowName, WindowManagerStateHelper.SPLASH_SCREEN_NAME,
	WindowManagerStateHelper.SNAPSHOT_WINDOW_NAME, *HOME_WINDOW_TITLE)		WindowManagerStateHelper.SNAPSHOT_WINDOW_NAME, *HOME_WINDOW_TITLE)

	@FlakyTest(bugId = 169271943)		@Presubmit
	@Test		@Test
	fun dockedStackPrimaryBoundsIsVisible() =		fun dockedStackPrimaryBoundsIsVisible() =
	testSpec.dockedStackPrimaryBoundsIsVisible(testSpec.config.startRotation,		testSpec.dockedStackPrimaryBoundsIsVisible(testSpec.config.startRotation,

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

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -18,7 +18,6 @@ package com.android.wm.shell.flicker.legacysplitscreen

	import android.platform.test.annotations.Presubmit		import android.platform.test.annotations.Presubmit
	import android.view.Surface		import android.view.Surface
	import androidx.test.filters.FlakyTest
	import androidx.test.filters.RequiresDevice		import androidx.test.filters.RequiresDevice
	import com.android.server.wm.flicker.FlickerParametersRunnerFactory		import com.android.server.wm.flicker.FlickerParametersRunnerFactory
	import com.android.server.wm.flicker.FlickerTestParameter		import com.android.server.wm.flicker.FlickerTestParameter
	@@ -66,13 +65,13 @@ class EnterSplitScreenLaunchToSide(
	secondaryApp.defaultWindowName, WindowManagerStateHelper.SPLASH_SCREEN_NAME,		secondaryApp.defaultWindowName, WindowManagerStateHelper.SPLASH_SCREEN_NAME,
	WindowManagerStateHelper.SNAPSHOT_WINDOW_NAME)		WindowManagerStateHelper.SNAPSHOT_WINDOW_NAME)

	@FlakyTest(bugId = 169271943)		@Presubmit
	@Test		@Test
	fun dockedStackPrimaryBoundsIsVisible() =		fun dockedStackPrimaryBoundsIsVisible() =
	testSpec.dockedStackPrimaryBoundsIsVisible(testSpec.config.startRotation,		testSpec.dockedStackPrimaryBoundsIsVisible(testSpec.config.startRotation,
	splitScreenApp.defaultWindowName)		splitScreenApp.defaultWindowName)

	@FlakyTest(bugId = 169271943)		@Presubmit
	@Test		@Test
	fun dockedStackSecondaryBoundsIsVisible() =		fun dockedStackSecondaryBoundsIsVisible() =
	testSpec.dockedStackSecondaryBoundsIsVisible(testSpec.config.startRotation,		testSpec.dockedStackSecondaryBoundsIsVisible(testSpec.config.startRotation,
	@@ -80,7 +79,6 @@ class EnterSplitScreenLaunchToSide(

	@Presubmit		@Presubmit
	@Test		@Test
	// b/169271943
	fun dockedStackDividerBecomesVisible() = testSpec.dockedStackDividerBecomesVisible()		fun dockedStackDividerBecomesVisible() = testSpec.dockedStackDividerBecomesVisible()

	@Presubmit		@Presubmit

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

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -62,11 +62,11 @@ class RotateOneLaunchedAppAndEnterSplitScreen(
	}		}
	}		}

	@FlakyTest(bugId = 175687842)		@Presubmit
	@Test		@Test
	fun dockedStackDividerIsVisible() = testSpec.dockedStackDividerIsVisible()		fun dockedStackDividerIsVisible() = testSpec.dockedStackDividerIsVisible()

	@FlakyTest(bugId = 175687842)		@Presubmit
	@Test		@Test
	fun dockedStackPrimaryBoundsIsVisible() =		fun dockedStackPrimaryBoundsIsVisible() =
	testSpec.dockedStackPrimaryBoundsIsVisible(testSpec.config.startRotation,		testSpec.dockedStackPrimaryBoundsIsVisible(testSpec.config.startRotation,

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

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -62,11 +62,11 @@ class RotateOneLaunchedAppInSplitScreenMode(
	}		}
	}		}

	@FlakyTest(bugId = 175687842)		@Presubmit
	@Test		@Test
	fun dockedStackDividerIsVisible() = testSpec.dockedStackDividerIsVisible()		fun dockedStackDividerIsVisible() = testSpec.dockedStackDividerIsVisible()

	@FlakyTest(bugId = 175687842)		@Presubmit
	@Test		@Test
	fun dockedStackPrimaryBoundsIsVisible() = testSpec.dockedStackPrimaryBoundsIsVisible(		fun dockedStackPrimaryBoundsIsVisible() = testSpec.dockedStackPrimaryBoundsIsVisible(
	testSpec.config.startRotation, splitScreenApp.defaultWindowName)		testSpec.config.startRotation, splitScreenApp.defaultWindowName)