Merge "Replace coversRegion for coversAtLeastRegion" (7ffce025) · Commits · e / os / android_frameworks_base

tests/FlickerTests/src/com/android/server/wm/flicker/CommonAssertions.kt

+5 −5

Original line number	Diff line number	Diff line
		@@ -53,19 +53,19 @@ fun LayersAssertion.noUncoveredRegions(
		if (allStates) {
		all("noUncoveredRegions", enabled, bugId) {
		if (startingBounds == endingBounds) {
		this.coversRegion(startingBounds)
		this.coversAtLeastRegion(startingBounds)
		} else {
		this.coversRegion(startingBounds)
		this.coversAtLeastRegion(startingBounds)
		.then()
		.coversRegion(endingBounds)
		.coversAtLeastRegion(endingBounds)
		}
		}
		} else {
		start("noUncoveredRegions_StartingPos") {
		this.coversRegion(startingBounds)
		this.coversAtLeastRegion(startingBounds)
		}
		end("noUncoveredRegions_EndingPos") {
		this.coversRegion(endingBounds)
		this.coversAtLeastRegion(endingBounds)
		}
		}
		}

+3 −3

Original line number	Diff line number	Diff line
		@@ -128,11 +128,11 @@ class SeamlessAppRotationTest(
		val startingBounds = WindowUtils.getDisplayBounds(beginRotation)
		val endingBounds = WindowUtils.getDisplayBounds(endRotation)
		if (startingBounds == endingBounds) {
		this.coversRegion(startingBounds)
		this.coversAtLeastRegion(startingBounds)
		} else {
		this.coversRegion(startingBounds)
		this.coversAtLeastRegion(startingBounds)
		.then()
		.coversRegion(endingBounds)
		.coversAtLeastRegion(endingBounds)
		}
		}
		}