From 29deae51ee31b6d474979eba003cc9b8e00330f2 Mon Sep 17 00:00:00 2001 From: Tracy Zhou Date: Thu, 13 Jul 2023 09:50:33 -0700 Subject: [PATCH] Fix testAllAppsFromHome failure Fixes: 291072758 Test: presubmit Change-Id: If2cd0d5d67ab5b2b4b6ca918b6e7a8777ee9f030 --- .../tapl/LauncherInstrumentation.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java index 5b67d73e8e..89f141f54a 100644 --- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java +++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java @@ -223,6 +223,10 @@ public final class LauncherInstrumentation { return getTouchEventPattern("Touch event", action); } + private static Pattern getTouchEventPattern(String action, int pointerCount) { + return getTouchEventPattern("Touch event", action, pointerCount); + } + private static Pattern getTouchEventPatternTIS(String action) { return getTouchEventPattern("TouchInteractionService.onInputEvent", action); } @@ -1803,11 +1807,25 @@ public final class LauncherInstrumentation { break; case MotionEvent.ACTION_POINTER_DOWN: mPointerCount++; + if (gestureScope != GestureScope.OUTSIDE_WITH_PILFER + && gestureScope != GestureScope.OUTSIDE_WITHOUT_PILFER + && gestureScope != GestureScope.OUTSIDE_WITH_KEYCODE + && (!isTrackpadGesture || isTwoFingerTrackpadGesture)) { + expectEvent(TestProtocol.SEQUENCE_MAIN, + getTouchEventPattern("ACTION_POINTER_DOWN", mPointerCount)); + } expectEvent(TestProtocol.SEQUENCE_TIS, getTouchEventPatternTIS( "ACTION_POINTER_DOWN", mPointerCount)); pointerCount = mPointerCount; break; case MotionEvent.ACTION_POINTER_UP: + if (gestureScope != GestureScope.OUTSIDE_WITH_PILFER + && gestureScope != GestureScope.OUTSIDE_WITHOUT_PILFER + && gestureScope != GestureScope.OUTSIDE_WITH_KEYCODE + && (!isTrackpadGesture || isTwoFingerTrackpadGesture)) { + expectEvent(TestProtocol.SEQUENCE_MAIN, + getTouchEventPattern("ACTION_POINTER_UP", mPointerCount)); + } // When the gesture is handled outside, it's cancelled within launcher. if (gestureScope != GestureScope.INSIDE_TO_OUTSIDE_WITH_KEYCODE && gestureScope != GestureScope.OUTSIDE_WITH_KEYCODE) {