summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVadim Tryshev <vadimt@google.com>2019-04-03 20:21:29 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-04-03 20:21:29 +0000
commit1f95993e137676150ba82012ed09e26007726c65 (patch)
treef636bd4cf4f794d2027f06acf0171e7b14107f1a
parent65f2396ecd5627a20a681cd3d10d29af33d4ec58 (diff)
parent840ed21605eed17da26d32edbd0edad7f0917814 (diff)
downloadandroid_packages_apps_Trebuchet-1f95993e137676150ba82012ed09e26007726c65.tar.gz
android_packages_apps_Trebuchet-1f95993e137676150ba82012ed09e26007726c65.tar.bz2
android_packages_apps_Trebuchet-1f95993e137676150ba82012ed09e26007726c65.zip
Merge "Not swiping from nav bar from Overview to all apps" into ub-launcher3-master
-rw-r--r--tests/tapl/com/android/launcher3/tapl/Overview.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/tapl/com/android/launcher3/tapl/Overview.java b/tests/tapl/com/android/launcher3/tapl/Overview.java
index 41932c8cb..b88da3a02 100644
--- a/tests/tapl/com/android/launcher3/tapl/Overview.java
+++ b/tests/tapl/com/android/launcher3/tapl/Overview.java
@@ -18,8 +18,6 @@ package com.android.launcher3.tapl;
import static com.android.launcher3.TestProtocol.ALL_APPS_STATE_ORDINAL;
-import android.graphics.Point;
-
import androidx.annotation.NonNull;
import androidx.test.uiautomator.UiObject2;
@@ -53,9 +51,9 @@ public final class Overview extends BaseOverview {
// Swipe from navbar to the top.
final UiObject2 navBar = mLauncher.waitForSystemUiObject("navigation_bar_frame");
- final Point start = navBar.getVisibleCenter();
LauncherInstrumentation.log("Overview.switchToAllApps before swipe");
- mLauncher.swipe(start.x, start.y, start.x, 0, ALL_APPS_STATE_ORDINAL);
+ final int x = navBar.getVisibleCenter().x;
+ mLauncher.swipe(x, navBar.getVisibleBounds().top - 1, x, 0, ALL_APPS_STATE_ORDINAL);
try (LauncherInstrumentation.Closable c1 = mLauncher.addContextLayer(
"swiped all way up from overview")) {