diff options
3 files changed, 12 insertions, 26 deletions
diff --git a/tests/tapl/com/android/launcher3/tapl/AllAppsFromOverview.java b/tests/tapl/com/android/launcher3/tapl/AllAppsFromOverview.java index c3b671bcc..a472d3134 100644 --- a/tests/tapl/com/android/launcher3/tapl/AllAppsFromOverview.java +++ b/tests/tapl/com/android/launcher3/tapl/AllAppsFromOverview.java @@ -53,9 +53,9 @@ public final class AllAppsFromOverview extends AllApps { TestProtocol.REQUEST_ALL_APPS_TO_OVERVIEW_SWIPE_HEIGHT). getInt(TestProtocol.TEST_INFO_RESPONSE_FIELD); - final int endY = start.y + swipeHeight + mLauncher.getTouchSlop(); + final int endY = start.y + swipeHeight; LauncherInstrumentation.log("AllAppsFromOverview.switchBackToOverview before swipe"); - mLauncher.swipe(start.x, start.y, start.x, endY, OVERVIEW_STATE_ORDINAL); + mLauncher.swipeToState(start.x, start.y, start.x, endY, 60, OVERVIEW_STATE_ORDINAL); try (LauncherInstrumentation.Closable c1 = mLauncher.addContextLayer("swiped down")) { return new Overview(mLauncher); diff --git a/tests/tapl/com/android/launcher3/tapl/Background.java b/tests/tapl/com/android/launcher3/tapl/Background.java index 8f5e7fed0..55e14cc80 100644 --- a/tests/tapl/com/android/launcher3/tapl/Background.java +++ b/tests/tapl/com/android/launcher3/tapl/Background.java @@ -86,9 +86,10 @@ public class Background extends LauncherInstrumentation.VisibleContainer { final int swipeHeight = mLauncher.getTestInfo(getSwipeHeightRequestName()). getInt(TestProtocol.TEST_INFO_RESPONSE_FIELD); - mLauncher.swipe( + mLauncher.swipeToState( centerX, startY, centerX, startY - swipeHeight - mLauncher.getTouchSlop(), + 60, expectedState); break; } diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java index 57fd4b921..a4711f5f1 100644 --- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java +++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java @@ -584,18 +584,15 @@ public final class LauncherInstrumentation { return mDevice; } - void swipe(int startX, int startY, int endX, int endY, int expectedState) { - swipe(startX, startY, endX, endY, expectedState, 60); - } - - void swipe(int startX, int startY, int endX, int endY, int expectedState, int steps) { - changeStateViaGesture(startX, startY, endX, endY, expectedState, - () -> mDevice.swipe(startX, startY, endX, endY, steps)); - } - void swipeToState(int startX, int startY, int endX, int endY, int steps, int expectedState) { - changeStateViaGesture(startX, startY, endX, endY, expectedState, - () -> linearGesture(startX, startY, endX, endY, steps)); + final Bundle parcel = (Bundle) executeAndWaitForEvent( + () -> linearGesture(startX, startY, endX, endY, steps), + event -> TestProtocol.SWITCHED_TO_STATE_MESSAGE.equals(event.getClassName()), + "Swipe failed to receive an event for the swipe end: " + startX + ", " + startY + + ", " + endX + ", " + endY); + assertEquals("Swipe switched launcher to a wrong state;", + TestProtocol.stateOrdinalToString(expectedState), + TestProtocol.stateOrdinalToString(parcel.getInt(TestProtocol.STATE_FIELD))); } void scroll(UiObject2 container, Direction direction, float percent, Rect margins, int steps) { @@ -652,18 +649,6 @@ public final class LauncherInstrumentation { sendPointer(downTime, endTime, MotionEvent.ACTION_UP, end); } - private void changeStateViaGesture(int startX, int startY, int endX, int endY, - int expectedState, Runnable gesture) { - final Bundle parcel = (Bundle) executeAndWaitForEvent( - gesture, - event -> TestProtocol.SWITCHED_TO_STATE_MESSAGE.equals(event.getClassName()), - "Swipe failed to receive an event for the swipe end: " + startX + ", " + startY - + ", " + endX + ", " + endY); - assertEquals("Swipe switched launcher to a wrong state;", - TestProtocol.stateOrdinalToString(expectedState), - TestProtocol.stateOrdinalToString(parcel.getInt(TestProtocol.STATE_FIELD))); - } - void waitForIdle() { mDevice.waitForIdle(); } |