From 3220e9521f08feb6e066e465f168149efda23d6b Mon Sep 17 00:00:00 2001 From: Alex Chau Date: Fri, 8 Oct 2021 12:43:27 +0100 Subject: [PATCH] Avoid scrolling within edgeSensitivityWidth in overview tests Fix: 202155383 Test: TaplTestsQuickstep.testOverviewActions with 1 task in overview Change-Id: If137da179d93c9dcf413f431bf437083bfd0e737 --- tests/tapl/com/android/launcher3/tapl/BaseOverview.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/tapl/com/android/launcher3/tapl/BaseOverview.java b/tests/tapl/com/android/launcher3/tapl/BaseOverview.java index 20366aae1f..b037be4295 100644 --- a/tests/tapl/com/android/launcher3/tapl/BaseOverview.java +++ b/tests/tapl/com/android/launcher3/tapl/BaseOverview.java @@ -57,7 +57,8 @@ public class BaseOverview extends LauncherInstrumentation.VisibleContainer { mLauncher.addContextLayer("want to fling forward in overview")) { LauncherInstrumentation.log("Overview.flingForward before fling"); final UiObject2 overview = verifyActiveContainer(); - final int leftMargin = mLauncher.getTargetInsets().left; + final int leftMargin = + mLauncher.getTargetInsets().left + mLauncher.getEdgeSensitivityWidth(); mLauncher.scroll( overview, Direction.LEFT, new Rect(leftMargin + 1, 0, 0, 0), 20, false); try (LauncherInstrumentation.Closable c2 = @@ -97,7 +98,8 @@ public class BaseOverview extends LauncherInstrumentation.VisibleContainer { mLauncher.addContextLayer("want to fling backward in overview")) { LauncherInstrumentation.log("Overview.flingBackward before fling"); final UiObject2 overview = verifyActiveContainer(); - final int rightMargin = mLauncher.getTargetInsets().right; + final int rightMargin = + mLauncher.getTargetInsets().right + mLauncher.getEdgeSensitivityWidth(); mLauncher.scroll( overview, Direction.RIGHT, new Rect(0, 0, rightMargin + 1, 0), 20, false); try (LauncherInstrumentation.Closable c2 =