commit e516cb1b9f5db5a312dc4cbef917aa6b673ea5bd
author Vadim Tryshev <vadimt@google.com> Mon Feb 25 19:05:42 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Feb 25 19:05:42 2019 +0000
tree 993a53940c7a9ebc3e5d9195ef9f89c59e2de29b
parent 1de3c5078caf7d8acd33d5e45be2e36917815324
parent 1dc7ab885b8fe7f739ba27c0718e4990ce216df5

Merge "Not using pressHome to start Launcher when tests are running in-proc" into ub-launcher3-master

tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java

diff --git a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
index 33cb5be..6f2f280 100644
--- a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
+++ b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
@@ -110,7 +110,11 @@
 
     public static void initialize(AbstractLauncherUiTest test) throws Exception {
         test.clearLauncherData();
-        test.mDevice.pressHome();
+        if (TestHelpers.isInLauncherProcess()) {
+            test.mActivityMonitor.returnToHome();
+        } else {
+            test.mDevice.pressHome();
+        }
         test.waitForLauncherCondition("Launcher didn't start", launcher -> launcher != null);
         test.waitForState("Launcher internal state didn't switch to Home", LauncherState.NORMAL);
         test.waitForResumed("Launcher internal state is still Background");