Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab56bf20 authored by Mateusz Cicheński's avatar Mateusz Cicheński Committed by Android (Google) Code Review
Browse files

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

parents 6d063f73 074a0ca5

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

+10 −8
Original line number Diff line number Diff line
@@ -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.traces.common.FlickerComponentName



val LAUNCHER_COMPONENT = FlickerComponentName("com.google.android.apps.nexuslauncher",

        "com.google.android.apps.nexuslauncher.NexusLauncherActivity")

val LAUNCHER_COMPONENT = FlickerComponentName(

    "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
@@ -112,7 +114,7 @@ fun FlickerTestParameter.navBarLayerPositionStart() { 
        val display = this.entry.displays.minByOrNull { it.id }

            ?: throw RuntimeException("There is no display!")

        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 }

            ?: throw RuntimeException("There is no display!")

        this.visibleRegion(FlickerComponentName.NAV_BAR)

                .coversExactly(WindowUtils.getNavigationBarPosition(display))

            .coversExactly(WindowUtils.getNavigationBarPosition(display, isGesturalNavigation))

    }

}