diff options
| author | Vadim Tryshev <vadimt@google.com> | 2019-05-01 19:53:42 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-05-01 19:53:42 +0000 |
| commit | dffb214d0f8769cb8c8fbeda91e7ad6b1c4f2f15 (patch) | |
| tree | a127e23f6350de9f675c7b208653816a0a076e5b /quickstep/tests/src | |
| parent | 428617ebe7946ab8194053806893e3f0edabfeec (diff) | |
| parent | f1e0c90a3b4c3ea193527bbff4b4df32955658dc (diff) | |
| download | android_packages_apps_Trebuchet-dffb214d0f8769cb8c8fbeda91e7ad6b1c4f2f15.tar.gz android_packages_apps_Trebuchet-dffb214d0f8769cb8c8fbeda91e7ad6b1c4f2f15.tar.bz2 android_packages_apps_Trebuchet-dffb214d0f8769cb8c8fbeda91e7ad6b1c4f2f15.zip | |
Merge "Not using Contacts app" into ub-launcher3-qt-dev
Diffstat (limited to 'quickstep/tests/src')
| -rw-r--r-- | quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java index b0ce5f5dc..4b6b3eeaf 100644 --- a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java +++ b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java @@ -64,7 +64,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { private void startTestApps() throws Exception { startAppFast(getAppPackageName()); startAppFast(resolveSystemApp(Intent.CATEGORY_APP_CALCULATOR)); - startAppFast(resolveSystemApp(Intent.CATEGORY_APP_CONTACTS)); + startTestActivity(2); executeOnLauncher(launcher -> assertTrue( "Launcher activity is the top activity; expecting another activity to be the top " @@ -130,8 +130,8 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { OverviewTask task = mLauncher.pressHome().switchToOverview().getCurrentTask(); assertNotNull("overview.getCurrentTask() returned null (1)", task); assertNotNull("OverviewTask.open returned null", task.open()); - assertTrue("Contacts app didn't open from Overview", mDevice.wait(Until.hasObject( - By.pkg(resolveSystemApp(Intent.CATEGORY_APP_CONTACTS)).depth(0)), + assertTrue("Test activity didn't open from Overview", mDevice.wait(Until.hasObject( + By.pkg(getAppPackageName()).text("TestActivity2")), LONG_WAIT_TIME_MS)); executeOnLauncher(launcher -> assertTrue( "Launcher activity is the top activity; expecting another activity to be the top " |