diff options
author | Vadim Tryshev <vadimt@google.com> | 2019-06-13 20:56:55 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-06-13 20:56:55 +0000 |
commit | c0893bc33e910d694038e2d6f9cb380f1ef2c26c (patch) | |
tree | c68297694c3255850be9c35500b4b32f9c262e3c /tests | |
parent | 8f3f2f33d316b32d7dc9fb0a4c3d01d5bcdb1636 (diff) | |
parent | 91cd0b78e695a9e6170d267a641a47ced79af73b (diff) | |
download | android_packages_apps_Trebuchet-c0893bc33e910d694038e2d6f9cb380f1ef2c26c.tar.gz android_packages_apps_Trebuchet-c0893bc33e910d694038e2d6f9cb380f1ef2c26c.tar.bz2 android_packages_apps_Trebuchet-c0893bc33e910d694038e2d6f9cb380f1ef2c26c.zip |
Merge "Switched scrolling in all apps to the model-time scrolling" into ub-launcher3-qt-dev
Diffstat (limited to 'tests')
-rw-r--r-- | tests/tapl/com/android/launcher3/tapl/AllApps.java | 43 |
1 files changed, 11 insertions, 32 deletions
diff --git a/tests/tapl/com/android/launcher3/tapl/AllApps.java b/tests/tapl/com/android/launcher3/tapl/AllApps.java index 21d763e30..9ff354a7e 100644 --- a/tests/tapl/com/android/launcher3/tapl/AllApps.java +++ b/tests/tapl/com/android/launcher3/tapl/AllApps.java @@ -16,8 +16,6 @@ package com.android.launcher3.tapl; -import static com.android.launcher3.tapl.LauncherInstrumentation.NavigationModel.ZERO_BUTTON; - import android.graphics.Point; import android.graphics.Rect; import android.widget.TextView; @@ -36,7 +34,6 @@ import com.android.launcher3.testing.TestProtocol; */ public class AllApps extends LauncherInstrumentation.VisibleContainer { private static final int MAX_SCROLL_ATTEMPTS = 40; - private static final int MIN_INTERACT_SIZE = 100; private final int mHeight; @@ -65,13 +62,6 @@ public class AllApps extends LauncherInstrumentation.VisibleContainer { } final Rect iconBounds = icon.getVisibleBounds(); LauncherInstrumentation.log("hasClickableIcon: icon bounds: " + iconBounds); - if (mLauncher.getNavigationModel() != ZERO_BUTTON) { - final UiObject2 navBar = mLauncher.waitForSystemUiObject("navigation_bar_frame"); - if (iconBounds.bottom >= navBar.getVisibleBounds().top) { - LauncherInstrumentation.log("hasClickableIcon: icon intersects with nav bar"); - return false; - } - } if (iconCenterInSearchBox(allAppsContainer, icon)) { LauncherInstrumentation.log("hasClickableIcon: icon center is under search box"); return false; @@ -96,7 +86,7 @@ public class AllApps extends LauncherInstrumentation.VisibleContainer { @NonNull public AppIcon getAppIcon(String appName) { try (LauncherInstrumentation.Closable c = mLauncher.addContextLayer( - "want to get app icon " + appName + " on all apps")) { + "getting app icon " + appName + " on all apps")) { final UiObject2 allAppsContainer = verifyActiveContainer(); final UiObject2 appListRecycler = mLauncher.waitForObjectInContainer(allAppsContainer, "apps_list_view"); @@ -110,21 +100,28 @@ public class AllApps extends LauncherInstrumentation.VisibleContainer { if (!hasClickableIcon(allAppsContainer, appListRecycler, appIconSelector)) { scrollBackToBeginning(); int attempts = 0; + int scroll = getScroll(allAppsContainer); try (LauncherInstrumentation.Closable c1 = mLauncher.addContextLayer("scrolled")) { - while (!hasClickableIcon(allAppsContainer, appListRecycler, appIconSelector) && - allAppsContainer.scroll(Direction.DOWN, 0.8f)) { + while (!hasClickableIcon(allAppsContainer, appListRecycler, appIconSelector)) { + mLauncher.scroll(allAppsContainer, Direction.DOWN, 0.8f, null, 50); + final int newScroll = getScroll(allAppsContainer); + if (newScroll == scroll) break; + mLauncher.assertTrue( "Exceeded max scroll attempts: " + MAX_SCROLL_ATTEMPTS, ++attempts <= MAX_SCROLL_ATTEMPTS); verifyActiveContainer(); + scroll = newScroll; } } verifyActiveContainer(); } + mLauncher.assertTrue("Unable to scroll to a clickable icon: " + appName, + hasClickableIcon(allAppsContainer, appListRecycler, appIconSelector)); + final UiObject2 appIcon = mLauncher.getObjectInContainer(appListRecycler, appIconSelector); - ensureIconVisible(appIcon, allAppsContainer, appListRecycler); return new AppIcon(mLauncher, appIcon); } } @@ -162,24 +159,6 @@ public class AllApps extends LauncherInstrumentation.VisibleContainer { getInt(TestProtocol.SCROLL_Y_FIELD, -1); } - private void ensureIconVisible( - UiObject2 appIcon, UiObject2 allAppsContainer, UiObject2 appListRecycler) { - final int appHeight = appIcon.getVisibleBounds().height(); - if (appHeight < MIN_INTERACT_SIZE) { - // Try to figure out how much percentage of the container needs to be scrolled in order - // to reveal the app icon to have the MIN_INTERACT_SIZE - final float pct = Math.max(((float) (MIN_INTERACT_SIZE - appHeight)) / mHeight, 0.2f); - mLauncher.scroll(appListRecycler, Direction.DOWN, pct, null, 10); - try (LauncherInstrumentation.Closable c = mLauncher.addContextLayer( - "scrolled an icon in all apps to make it visible - and then")) { - mLauncher.waitForIdle(); - verifyActiveContainer(); - } - } - mLauncher.assertTrue("Couldn't scroll app icon to not intersect with the search box", - !iconCenterInSearchBox(allAppsContainer, appIcon)); - } - private UiObject2 getSearchBox(UiObject2 allAppsContainer) { return mLauncher.waitForObjectInContainer(allAppsContainer, "search_container_all_apps"); } |