From b7c06d6624e7eff6e41aa9638d73907ebd77e5d6 Mon Sep 17 00:00:00 2001 From: Jeff Chang Date: Tue, 18 Apr 2023 12:05:19 +0000 Subject: Fix DragDividerToResize flicker tests Update the proper steps number for testing split resizing.Refine the tests since only the secondary side will be invisible with screenshot/icon-view fade animation. Bug: 278008901 Test: atest WMShellFlickerTests:DragDividerToResize Change-Id: Idd3f40d0e4da3f55092be9661c61215585d6a68c --- .../flicker/src/com/android/wm/shell/flicker/CommonAssertions.kt | 9 --------- .../com/android/wm/shell/flicker/splitscreen/SplitScreenUtils.kt | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) (limited to 'libs') diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/CommonAssertions.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/CommonAssertions.kt index c416ad011c4e..45024f387c25 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/CommonAssertions.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/CommonAssertions.kt @@ -223,15 +223,6 @@ fun FlickerTest.splitAppLayerBoundsChanges( portraitPosTop, scenario.endRotation ) - .then() - .isInvisible(component) - .then() - .splitAppLayerBoundsSnapToDivider( - component, - landscapePosLeft, - portraitPosTop, - scenario.endRotation - ) } else { splitAppLayerBoundsSnapToDivider( component, diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/SplitScreenUtils.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/SplitScreenUtils.kt index 62936e0f5ca8..625987a2e7ef 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/SplitScreenUtils.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/SplitScreenUtils.kt @@ -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() -- cgit v1.2.3-59-g8ed1b