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

Commit a822a285 authored by Mateusz Cicheński's avatar Mateusz Cicheński Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18803472



Change-Id: I91cd9a3f526f1cc509f7bf580ba1235b4a141d13
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dc0662ee ab56bf20

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))

    }

}