Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 485f2a53 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Avoid scrolling within edgeSensitivityWidth in overview tests" into sc-v2-dev

parents d9422872 3220e952

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

+4 −2
Original line number Diff line number Diff line
@@ -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 =