commit d8436734342080ea832b9a1373e697a7e7efc840
author Pinyao Ting <pinyaoting@google.com> Mon Sep 30 13:54:36 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Sep 30 13:54:36 2019 -0700
tree cf364fcbf7131c55e030b11e2f09ab49a4db0b4d
parent 38763eca5d27310cfa5e18d84d0653f7bb6c443c
parent d8aef47393d681b2b018d1fad350cdcb77c0089e

Merge "removed extra test protocol for unit test" into ub-launcher3-qt-future-dev
am: d8aef47393

Change-Id: I0d69c2ec0e3d693d4556314fd1b74dabd0a8cbd2

src/com/android/launcher3/PagedView.java

diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 34b102c..5c790f3 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -1708,11 +1708,4 @@
         mTmpIntPair[1] = rightChild;
         return mTmpIntPair;
     }
-
-    /**
-     * Returns true if overscroll is allowed, otherwise false.
-     */
-    public boolean allowOverScroll() {
-        return mAllowOverScroll;
-    }
 }

src/com/android/launcher3/testing/TestInformationHandler.java

diff --git a/src/com/android/launcher3/testing/TestInformationHandler.java b/src/com/android/launcher3/testing/TestInformationHandler.java
index aa6c471..f5f61cd 100644
--- a/src/com/android/launcher3/testing/TestInformationHandler.java
+++ b/src/com/android/launcher3/testing/TestInformationHandler.java
@@ -82,14 +82,6 @@
                 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;

src/com/android/launcher3/testing/TestProtocol.java

diff --git a/src/com/android/launcher3/testing/TestProtocol.java b/src/com/android/launcher3/testing/TestProtocol.java
index 2ecc0e7..ac080c2 100644
--- a/src/com/android/launcher3/testing/TestProtocol.java
+++ b/src/com/android/launcher3/testing/TestProtocol.java
@@ -63,8 +63,6 @@
             "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";

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

diff --git a/tests/tapl/com/android/launcher3/tapl/Workspace.java b/tests/tapl/com/android/launcher3/tapl/Workspace.java
index ad2feb4..0aa36dd 100644
--- a/tests/tapl/com/android/launcher3/tapl/Workspace.java
+++ b/tests/tapl/com/android/launcher3/tapl/Workspace.java
@@ -22,7 +22,6 @@
 
 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 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 @@
                 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