From 8cea8194e0fac3e8a175fc4ea80acdd931e8e614 Mon Sep 17 00:00:00 2001 From: Hyunyoung Song Date: Wed, 22 Jun 2016 09:59:40 -0700 Subject: Fix LauncherInstrumentationTestCase#openAllApps() method. b/29535532 Change-Id: Iebf20c2fe66ad244b04658b15ade21d579fb2c12 --- .../android/launcher3/ui/LauncherInstrumentationTestCase.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/src/com/android/launcher3/ui/LauncherInstrumentationTestCase.java b/tests/src/com/android/launcher3/ui/LauncherInstrumentationTestCase.java index a59f0ffc9..e858d17f3 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.LauncherSettings; 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 @@ public class LauncherInstrumentationTestCase extends InstrumentationTestCase { * 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); } -- cgit v1.2.3