commit 7c8ee4f8de0ce391af079d462397d5645b6dc834
author Alex Chau <alexchau@google.com> Sat Sep 17 03:30:32 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Sep 17 03:30:32 2022 +0000
tree 992f30862a711d62c9b68edacfdf581368d83333
parent 17c4741432a411e20ecc5c8f2c34d14720210fd0
parent 0a37f2b90edd431dea94c9c19036954af65afef4

Merge "Trying to fix flaky TAPL test on CF" into tm-qpr-dev

tests/tapl/com/android/launcher3/tapl/Workspace.java

diff --git a/tests/tapl/com/android/launcher3/tapl/Workspace.java b/tests/tapl/com/android/launcher3/tapl/Workspace.java
index 5fab7eb..2c9fdb3 100644
--- a/tests/tapl/com/android/launcher3/tapl/Workspace.java
+++ b/tests/tapl/com/android/launcher3/tapl/Workspace.java
@@ -475,7 +475,9 @@
             // Since the destination can be on another page, we need to drag to the edge first
             // until we reach the target page
             while (targetDest.x > displayX || targetDest.x < 0) {
-                int edgeX = targetDest.x > 0 ? displayX : 0;
+                // Don't drag all the way to the edge to prevent touch events from getting out of
+                //screen bounds.
+                int edgeX = targetDest.x > 0 ? displayX - 1 : 1;
                 Point screenEdge = new Point(edgeX, targetDest.y);
                 Point finalDragStart = dragStart;
                 executeAndWaitForPageScroll(launcher,