PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge \"Fix LauncherInstrumentationTestCase#openAllApps() method. b/29535532\" into ub-launcher3-calgary

Browse Source 
am: fce71421bf

Change-Id: I44b429b0e6aa8f5de30970cc3e8a64c619d668fb
This commit is contained in:
Hyunyoung Song
2016-06-22 17:07:44 +00:00
committed by android-build-merger
parent b9e1608b40 fce71421bf
commit b2c628f8ea
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/src/com/android/launcher3/ui/LauncherInstrumentationTestCase.java
+9 -2
View File
@@ -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);
}