openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
TreeHugger Robot 2019-09-30 20:46:15 +00:00 committed by Android (Google) Code Review
parent 5500f3513e ea38c25854
commit d8aef47393
4 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/launcher3/PagedView.java
View File

@ -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;
}
}

8
src/com/android/launcher3/testing/TestInformationHandler.java
View File

@ -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;

2
src/com/android/launcher3/testing/TestProtocol.java
View File

@ -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";

11
tests/tapl/com/android/launcher3/tapl/Workspace.java
View File

@ -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