Merge "Cleanup tapl test workaround" into tm-dev am: fd64b4f2b3 am: 4fad6bb302

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17983442

Change-Id: Id0b8bc372a8d6c756fa350bd6dc153ca482de819
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-04-28 13:57:41 +00:00
committed by Automerger Merge Worker
@@ -389,8 +389,7 @@ public final class Workspace extends Home {
// 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) {
// TODO: b/219919285
int edgeX = targetDest.x > 0 ? displayX - 1 : 1;
int edgeX = targetDest.x > 0 ? displayX : 0;
Point screenEdge = new Point(edgeX, targetDest.y);
Point finalDragStart = dragStart;
executeAndWaitForPageScroll(launcher,