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

Commit aab81829 authored by Nataniel Borges's avatar Nataniel Borges Committed by Android (Google) Code Review
Browse files

Merge "Update for compatibility with region subject" into udc-dev

parents 78929f07 35467270

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)