openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Switching from mDevice.pressHome() to mLauncher.pressHome()" into ub-launcher3-master

This commit is contained in:
TreeHugger Robot 2019-01-18 18:35:50 +00:00 committed by Android (Google) Code Review
parent ce1ffc320f 579c8c200d
commit 6a874a583e
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
quickstep/tests/src/com/android/quickstep/TaplTests.java
View File

@ -104,7 +104,7 @@ public class TaplTests extends AbstractQuickStepTest {
clearLauncherData();
mDevice.pressHome();
mLauncher.pressHome();
waitForState("Launcher internal state didn't switch to Home", LauncherState.NORMAL);
waitForResumed("Launcher internal state is still Background");
}
@ -424,7 +424,7 @@ public class TaplTests extends AbstractQuickStepTest {
executeOnLauncher(launcher -> assertTrue("Flinging backward didn't scroll widgets",
getWidgetsScroll(launcher) < flingForwardY));
mDevice.pressHome();
mLauncher.pressHome();
waitForLauncherCondition("Widgets were not closed",
launcher -> getWidgetsView(launcher) == null);
}

2
tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
View File

@ -123,7 +123,7 @@ public abstract class AbstractLauncherUiTest {
public void evaluate() throws Throwable {
try {
// Create launcher activity if necessary and bring it to the front.
mDevice.pressHome();
mLauncher.pressHome();
waitForLauncherCondition("Launcher activity wasn't created",
launcher -> launcher != null);

4
tests/src/com/android/launcher3/ui/AllAppsIconToHomeTest.java
View File

@ -21,14 +21,12 @@ public class AllAppsIconToHomeTest extends AbstractLauncherUiTest {
LauncherActivityInfo settingsApp = getSettingsApp();
clearHomescreen();
mDevice.pressHome();
mDevice.waitForIdle();
final String appName = settingsApp.getLabel().toString();
// 1. Open all apps and wait for load complete.
// 2. Drag icon to homescreen.
// 3. Verify that the icon works on homescreen.
mLauncher.getWorkspace().
mLauncher.pressHome().
switchToAllApps().
getAppIcon(appName).
dragToWorkspace().