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

Merge "Update the assertion to get correct navigation mode value." into tm-qpr-dev

Browse Source
This commit is contained in:
Mateusz Cicheński
2022-06-23 20:48:20 +00:00
committed by Android (Google) Code Review
parent 6d063f73e7 074a0ca5d3
commit ab56bf206c
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,8 +21,10 @@ import com.android.server.wm.flicker.helpers.WindowUtils
import com.android.server.wm.flicker.traces.region.RegionSubject import com.android.server.wm.flicker.traces.region.RegionSubject
import com.android.server.wm.traces.common.FlickerComponentName import com.android.server.wm.traces.common.FlickerComponentName
val LAUNCHER_COMPONENT = FlickerComponentName("com.google.android.apps.nexuslauncher", val LAUNCHER_COMPONENT = FlickerComponentName(
"com.google.android.apps.nexuslauncher.NexusLauncherActivity") "com.google.android.apps.nexuslauncher",
"com.google.android.apps.nexuslauncher.NexusLauncherActivity"
)
/** /**
* Checks that [FlickerComponentName.STATUS_BAR] window is visible and above the app windows in * Checks that [FlickerComponentName.STATUS_BAR] window is visible and above the app windows in
@@ -112,7 +114,7 @@ fun FlickerTestParameter.navBarLayerPositionStart() {
val display = this.entry.displays.minByOrNull { it.id } val display = this.entry.displays.minByOrNull { it.id }
?: throw RuntimeException("There is no display!") ?: throw RuntimeException("There is no display!")
this.visibleRegion(FlickerComponentName.NAV_BAR) this.visibleRegion(FlickerComponentName.NAV_BAR)
.coversExactly(WindowUtils.getNavigationBarPosition(display)) .coversExactly(WindowUtils.getNavigationBarPosition(display, isGesturalNavigation))
} }
} }
@@ -125,7 +127,7 @@ fun FlickerTestParameter.navBarLayerPositionEnd() {
val display = this.entry.displays.minByOrNull { it.id } val display = this.entry.displays.minByOrNull { it.id }
?: throw RuntimeException("There is no display!") ?: throw RuntimeException("There is no display!")
this.visibleRegion(FlickerComponentName.NAV_BAR) this.visibleRegion(FlickerComponentName.NAV_BAR)
.coversExactly(WindowUtils.getNavigationBarPosition(display)) .coversExactly(WindowUtils.getNavigationBarPosition(display, isGesturalNavigation))
} }
} }