commit 8cea8194e0fac3e8a175fc4ea80acdd931e8e614
author Hyunyoung Song <hyunyoungs@google.com> Wed Jun 22 09:59:40 2016 -0700
committer Hyunyoung Song <hyunyoungs@google.com> Wed Jun 22 09:59:40 2016 -0700
tree 3db062581fbcca99ce8f2cf6b3051a3d6a8474ef
parent eac1dac23944ea5127dc12a161f016f18a5599cb

Fix LauncherInstrumentationTestCase#openAllApps() method.
b/29535532

Change-Id: Iebf20c2fe66ad244b04658b15ade21d579fb2c12

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

diff --git a/tests/src/com/android/launcher3/ui/LauncherInstrumentationTestCase.java b/tests/src/com/android/launcher3/ui/LauncherInstrumentationTestCase.java
index a59f0ff..e858d17 100644
--- a/tests/src/com/android/launcher3/ui/LauncherInstrumentationTestCase.java
+++ b/tests/src/com/android/launcher3/ui/LauncherInstrumentationTestCase.java
@@ -28,6 +28,7 @@
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.compat.AppWidgetManagerCompat;
+import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.util.ManagedProfileHeuristic;
 
 import java.io.FileInputStream;
@@ -101,8 +102,14 @@
      * Opens all apps and returns the recycler view
      */
     protected UiObject2 openAllApps() {
-        mDevice.wait(Until.findObject(
-                By.desc(mTargetContext.getString(R.string.all_apps_button_label))), DEFAULT_UI_TIMEOUT).click();
+        if (FeatureFlags.LAUNCHER3_ALL_APPS_PULL_UP) {
+            // clicking on the page indicator brings up all apps tray on non tablets.
+            findViewById(R.id.page_indicator).click();
+        } else {
+            mDevice.wait(Until.findObject(
+                    By.desc(mTargetContext.getString(R.string.all_apps_button_label))),
+                    DEFAULT_UI_TIMEOUT).click();
+        }
         return findViewById(R.id.apps_list_view);
     }