Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Use the display 0 transform for assertions""

Browse Source
This commit is contained in:
TreeHugger Robot
2021-09-17 18:49:09 +00:00
committed by Android (Google) Code Review
parent 251fa87f30 2a0277cb55
commit 316587fad4
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -89,14 +89,14 @@ fun FlickerTestParameter.statusBarLayerIsVisible() {
fun FlickerTestParameter.navBarLayerRotatesAndScales() {
assertLayersStart {
val rotation = this.entry.displays.sortedBy { it.id }
.firstOrNull()?.transform?.getRotation() ?: Surface.ROTATION_0
val rotation = this.entry.displays.firstOrNull()?.transform?.getRotation()
?: Surface.ROTATION_0
this.visibleRegion(FlickerComponentName.NAV_BAR)
.coversExactly(WindowUtils.getNavigationBarPosition(rotation))
}
assertLayersEnd {
val rotation = this.entry.displays.sortedBy { it.id }
.firstOrNull()?.transform?.getRotation() ?: Surface.ROTATION_0
val rotation = this.entry.displays.firstOrNull()?.transform?.getRotation()
?: Surface.ROTATION_0
this.visibleRegion(FlickerComponentName.NAV_BAR)
.coversExactly(WindowUtils.getNavigationBarPosition(rotation))
}
@@ -104,14 +104,14 @@ fun FlickerTestParameter.navBarLayerRotatesAndScales() {
fun FlickerTestParameter.statusBarLayerRotatesScales() {
assertLayersStart {
val rotation = this.entry.displays.sortedBy { it.id }
.firstOrNull()?.transform?.getRotation() ?: Surface.ROTATION_0
val rotation = this.entry.displays.firstOrNull()?.transform?.getRotation()
?: Surface.ROTATION_0
this.visibleRegion(FlickerComponentName.STATUS_BAR)
.coversExactly(WindowUtils.getStatusBarPosition(rotation))
}
assertLayersEnd {
val rotation = this.entry.displays.sortedBy { it.id }
.firstOrNull()?.transform?.getRotation() ?: Surface.ROTATION_0
val rotation = this.entry.displays.firstOrNull()?.transform?.getRotation()
?: Surface.ROTATION_0
this.visibleRegion(FlickerComponentName.STATUS_BAR)
.coversExactly(WindowUtils.getStatusBarPosition(rotation))
}