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

Commit 1b12ce1a authored Apr 19, 2023 by Jeff Chang Committed by Automerger Merge Worker Apr 19, 2023

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

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

Change-Id: I4b3de588925b44d45fcf5538eb70754a94dc4457
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 1f722f3e e926e144

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