diff options
4 files changed, 5 insertions, 23 deletions
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index 34b102c0b..5c790f379 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -1708,11 +1708,4 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou mTmpIntPair[1] = rightChild; return mTmpIntPair; } - - /** - * Returns true if overscroll is allowed, otherwise false. - */ - public boolean allowOverScroll() { - return mAllowOverScroll; - } } diff --git a/src/com/android/launcher3/testing/TestInformationHandler.java b/src/com/android/launcher3/testing/TestInformationHandler.java index d62b591b8..d3ec83b4f 100644 --- a/src/com/android/launcher3/testing/TestInformationHandler.java +++ b/src/com/android/launcher3/testing/TestInformationHandler.java @@ -82,14 +82,6 @@ public class TestInformationHandler implements ResourceBasedOverride { break; } - case TestProtocol.REQUEST_DOES_WORKSPACE_HAVE_SECOND_PAGE: { - if (mLauncher == null) return null; - - response.putBoolean(TestProtocol.TEST_INFO_RESPONSE_FIELD, - mLauncher.getWorkspace().getPageCount() > 1); - break; - } - case TestProtocol.REQUEST_IS_LAUNCHER_INITIALIZED: { response.putBoolean(TestProtocol.TEST_INFO_RESPONSE_FIELD, true); break; diff --git a/src/com/android/launcher3/testing/TestProtocol.java b/src/com/android/launcher3/testing/TestProtocol.java index f9f59d8b6..62bb56404 100644 --- a/src/com/android/launcher3/testing/TestProtocol.java +++ b/src/com/android/launcher3/testing/TestProtocol.java @@ -66,8 +66,6 @@ public final class TestProtocol { "all-apps-to-overview-swipe-height"; public static final String REQUEST_HOME_TO_ALL_APPS_SWIPE_HEIGHT = "home-to-all-apps-swipe-height"; - public static final String REQUEST_DOES_WORKSPACE_HAVE_SECOND_PAGE = - "does-workspace-have-second-page"; public static final String REQUEST_HOTSEAT_TOP = "hotseat-top"; public static final String REQUEST_IS_LAUNCHER_INITIALIZED = "is-launcher-initialized"; public static final String REQUEST_FREEZE_APP_LIST = "freeze-app-list"; diff --git a/tests/tapl/com/android/launcher3/tapl/Workspace.java b/tests/tapl/com/android/launcher3/tapl/Workspace.java index ad2feb4b5..0aa36ddbb 100644 --- a/tests/tapl/com/android/launcher3/tapl/Workspace.java +++ b/tests/tapl/com/android/launcher3/tapl/Workspace.java @@ -22,7 +22,6 @@ import static junit.framework.TestCase.assertTrue; import android.graphics.Point; import android.graphics.Rect; -import android.os.Bundle; import android.os.SystemClock; import android.view.KeyEvent; import android.view.MotionEvent; @@ -124,7 +123,7 @@ public final class Workspace extends Home { */ public void ensureWorkspaceIsScrollable() { final UiObject2 workspace = verifyActiveContainer(); - if (!isWorkspaceScrollable()) { + if (!isWorkspaceScrollable(workspace)) { try (LauncherInstrumentation.Closable c = mLauncher.addContextLayer( "dragging icon to a second page of workspace to make it scrollable")) { dragIconToWorkspace( @@ -136,12 +135,12 @@ public final class Workspace extends Home { verifyActiveContainer(); } } - assertTrue("Home screen workspace didn't become scrollable", isWorkspaceScrollable()); + assertTrue("Home screen workspace didn't become scrollable", + isWorkspaceScrollable(workspace)); } - private boolean isWorkspaceScrollable() { - Bundle result = mLauncher.getTestInfo(TestProtocol.REQUEST_DOES_WORKSPACE_HAVE_SECOND_PAGE); - return result.getBoolean(TestProtocol.TEST_INFO_RESPONSE_FIELD, false); + private boolean isWorkspaceScrollable(UiObject2 workspace) { + return workspace.getChildCount() > 1; } @NonNull |