diff options
| author | vadimt <vadimt@google.com> | 2019-04-04 15:38:08 -0700 |
|---|---|---|
| committer | vadimt <vadimt@google.com> | 2019-04-04 15:38:08 -0700 |
| commit | 01e114bbf5347b4f21cba77e90bb943a384f738c (patch) | |
| tree | 6915c40099b261f4943d6e79c84d454bf9c5755e /tests | |
| parent | 24eb1c9c89f26f2371cc26c1eaa4e647820f2f0b (diff) | |
| download | android_packages_apps_Trebuchet-01e114bbf5347b4f21cba77e90bb943a384f738c.tar.gz android_packages_apps_Trebuchet-01e114bbf5347b4f21cba77e90bb943a384f738c.tar.bz2 android_packages_apps_Trebuchet-01e114bbf5347b4f21cba77e90bb943a384f738c.zip | |
Going home via swipe in supported cases
Change-Id: I8a127e206374e6e4274ad970cfaf132c3089125b
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java index c72f7d0b6..135bf00c2 100644 --- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java +++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java @@ -16,6 +16,9 @@ package com.android.launcher3.tapl; +import static com.android.launcher3.TestProtocol.BACKGROUND_APP_STATE_ORDINAL; +import static com.android.launcher3.TestProtocol.NORMAL_STATE_ORDINAL; + import android.app.ActivityManager; import android.app.Instrumentation; import android.app.UiAutomation; @@ -343,18 +346,33 @@ public final class LauncherInstrumentation { log(action = "0-button: already in workspace"); } else if (hasLauncherObject(OVERVIEW_RES_ID)) { log(action = "0-button: from overview"); - mDevice.pressHome(); + final UiObject2 navBar = waitForSystemUiObject("navigation_bar_frame"); + + swipe( + navBar.getVisibleBounds().centerX(), navBar.getVisibleBounds().centerY(), + navBar.getVisibleBounds().centerX(), 0, + NORMAL_STATE_ORDINAL, ZERO_BUTTON_STEPS_FROM_BACKGROUND_TO_HOME); } else if (hasLauncherObject(WIDGETS_RES_ID)) { log(action = "0-button: from widgets"); mDevice.pressHome(); } else if (hasLauncherObject(APPS_RES_ID)) { log(action = "0-button: from all apps"); - mDevice.pressHome(); + final UiObject2 navBar = waitForSystemUiObject("navigation_bar_frame"); + + swipe( + navBar.getVisibleBounds().centerX(), navBar.getVisibleBounds().centerY(), + navBar.getVisibleBounds().centerX(), 0, + NORMAL_STATE_ORDINAL, ZERO_BUTTON_STEPS_FROM_BACKGROUND_TO_HOME); } else { log(action = "0-button: from another app"); assertTrue("Launcher is visible, don't know how to go home", !mDevice.hasObject(By.pkg(getLauncherPackageName()))); - mDevice.pressHome(); + final UiObject2 navBar = waitForSystemUiObject("navigation_bar_frame"); + + swipe( + navBar.getVisibleBounds().centerX(), navBar.getVisibleBounds().centerY(), + navBar.getVisibleBounds().centerX(), 0, + BACKGROUND_APP_STATE_ORDINAL, ZERO_BUTTON_STEPS_FROM_BACKGROUND_TO_HOME); } } else { log(action = "clicking home button"); |