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

Commit 8c5905d1 authored by Jeff Chang's avatar Jeff Chang Committed by Automerger Merge Worker
Browse files

Merge "Fix DragDividerToResize flicker tests" into udc-dev am: e926e144 am: 1b12ce1a 

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



Change-Id: Ie65486ec4d5910743d252d6378a81327b0b0a3ad
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c68e4399 1b12ce1a

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

+0 −9
Original line number Diff line number Diff line
@@ -223,15 +223,6 @@ fun FlickerTest.splitAppLayerBoundsChanges( 
                    portraitPosTop,

                    scenario.endRotation

                )

                .then()

                .isInvisible(component)

                .then()

                .splitAppLayerBoundsSnapToDivider(

                    component,

                    landscapePosLeft,

                    portraitPosTop,

                    scenario.endRotation

                )

        } else {

            splitAppLayerBoundsSnapToDivider(

                    component,

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

+1 −1
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ internal object SplitScreenUtils { 
            wmHelper.currentState.layerState.displays.firstOrNull { !it.isVirtual }?.layerStackSpace

                ?: error("Display not found")

        val dividerBar = device.wait(Until.findObject(dividerBarSelector), TIMEOUT_MS)

        dividerBar.drag(Point(displayBounds.width * 1 / 3, displayBounds.height * 2 / 3), 2000)

        dividerBar.drag(Point(displayBounds.width * 1 / 3, displayBounds.height * 2 / 3), 200)



        wmHelper

            .StateSyncBuilder()