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

Commit 35467270 authored by Nataniel Borges's avatar Nataniel Borges
Browse files

Update for compatibility with region subject 

Bug: 237278810
Test: atest FlickerTests WMShellFlickerTests
Merged-In: I6b231ad50e8b8d7499ad6163033b0ab4ffaf4868
Change-Id: I8813bab58c9d117cd6dc5ece38997907e14eeae0
parent 8a3c37e3

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/CommonAssertions.kt

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ fun FlickerTest.splitAppLayerBoundsBecomesVisible( 
    portraitPosTop: Boolean

) {

    assertLayers {

        this.notContains(SPLIT_SCREEN_DIVIDER_COMPONENT.or(component))

        this.notContains(SPLIT_SCREEN_DIVIDER_COMPONENT.or(component), isOptional = true)

            .then()

            .isInvisible(SPLIT_SCREEN_DIVIDER_COMPONENT.or(component))

            .then()

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

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ fun FlickerTest.snapshotStartingWindowLayerCoversExactlyOnApp(component: ICompon 
                    snapshotLayers

                        .mapNotNull { snapshotLayer -> snapshotLayer.layer.visibleRegion }

                        .toTypedArray()

                val snapshotRegion = RegionSubject(visibleAreas, this, timestamp)

                val snapshotRegion = RegionSubject(visibleAreas, timestamp)

                val appVisibleRegion = it.visibleRegion(component)

                if (snapshotRegion.region.isNotEmpty) {

                    snapshotRegion.coversExactly(appVisibleRegion.region)

tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeOnDismissPopupDialogTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ open class CloseImeOnDismissPopupDialogTest(flicker: FlickerTest) : BaseTest(fli 
                        imeSnapshotLayers

                            .mapNotNull { imeSnapshotLayer -> imeSnapshotLayer.layer.visibleRegion }

                            .toTypedArray()

                    val imeVisibleRegion = RegionSubject(visibleAreas, this, timestamp)

                    val imeVisibleRegion = RegionSubject(visibleAreas, timestamp)

                    val appVisibleRegion = it.visibleRegion(imeTestApp)

                    if (imeVisibleRegion.region.isNotEmpty) {

                        imeVisibleRegion.coversAtMost(appVisibleRegion.region)