Merge "Avoid scrolling within edgeSensitivityWidth in overview tests" into sc-v2-dev am: 485f2a53b2

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

Change-Id: Ifac1ac169e1e83f002b4c8270f5dd0b4f8d1ec2d
This commit is contained in:
TreeHugger Robot
2021-10-14 18:31:49 +00:00
committed by Automerger Merge Worker
@@ -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 =