aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-28 15:56:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Renaming LauncherInstrumentation.pressHome to goHome" into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-03-14 20:37:06 +00:00
committed by Android (Google) Code Review
parent 763fd21b34 41c0b52cd9
commit 8cb2364c1a
7 changed files with 36 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,7 +48,7 @@ public class DigitalWellBeingToastTest extends AbstractQuickStepTest {
Duration.ofSeconds(600), Duration.ofSeconds(300),
PendingIntent.getActivity(mTargetContext, -1, new Intent(), 0)));
mLauncher.pressHome();
mLauncher.goHome();
final DigitalWellBeingToast toast = getToast();
waitForLauncherCondition("Toast is not visible", launcher -> toast.hasLimit());
@@ -58,7 +58,7 @@ public class DigitalWellBeingToastTest extends AbstractQuickStepTest {
runWithShellPermission(
() -> usageStatsManager.unregisterAppUsageLimitObserver(observerId));
mLauncher.pressHome();
mLauncher.goHome();
assertFalse("Toast is visible", getToast().hasLimit());
} finally {
runWithShellPermission(

8
quickstep/tests/src/com/android/quickstep/StartLauncherViaGestureTests.java
View File

@@ -41,7 +41,7 @@ public class StartLauncherViaGestureTests extends AbstractQuickStepTest {
super.setUp();
TaplTestsLauncher3.initialize(this);
// b/143488140
mLauncher.pressHome();
mLauncher.goHome();
// Start an activity where the gestures start.
startAppFast(resolveSystemApp(Intent.CATEGORY_APP_CALCULATOR));
}
@@ -54,7 +54,7 @@ public class StartLauncherViaGestureTests extends AbstractQuickStepTest {
// The test action.
eventProcessor.startIteration();
mLauncher.pressHome();
mLauncher.goHome();
eventProcessor.finishIteration();
}
@@ -66,7 +66,7 @@ public class StartLauncherViaGestureTests extends AbstractQuickStepTest {
closeLauncherActivity();
// The test action.
mLauncher.pressHome();
mLauncher.goHome();
}
}
@@ -81,6 +81,6 @@ public class StartLauncherViaGestureTests extends AbstractQuickStepTest {
mLauncher.getLaunchedAppState().switchToOverview();
}
closeLauncherActivity();
mLauncher.pressHome();
mLauncher.goHome();
}
}

26
quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
View File

@@ -102,7 +102,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
public void testOverview() throws Exception {
startTestAppsWithCheck();
// mLauncher.pressHome() also tests an important case of pressing home while in background.
Overview overview = mLauncher.pressHome().switchToOverview();
Overview overview = mLauncher.goHome().switchToOverview();
assertTrue("Launcher internal state didn't switch to Overview",
isInState(() -> LauncherState.OVERVIEW));
executeOnLauncher(
@@ -127,7 +127,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
getCurrentOverviewPage(launcher) < currentTaskAfterFlingForward));
// Test opening a task.
OverviewTask task = mLauncher.pressHome().switchToOverview().getCurrentTask();
OverviewTask task = mLauncher.goHome().switchToOverview().getCurrentTask();
assertNotNull("overview.getCurrentTask() returned null (1)", task);
assertNotNull("OverviewTask.open returned null", task.open());
assertTrue("Test activity didn't open from Overview", mDevice.wait(Until.hasObject(
@@ -139,7 +139,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
isInLaunchedApp(launcher)));
// Test dismissing a task.
overview = mLauncher.pressHome().switchToOverview();
overview = mLauncher.goHome().switchToOverview();
assertTrue("Launcher internal state didn't switch to Overview",
isInState(() -> LauncherState.OVERVIEW));
final Integer numTasks = getFromLauncher(launcher -> getTaskCount(launcher));
@@ -151,7 +151,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
numTasks - 1, getTaskCount(launcher)));
// Test dismissing all tasks.
mLauncher.pressHome().switchToOverview().dismissAllTasks();
mLauncher.goHome().switchToOverview().dismissAllTasks();
assertTrue("Launcher internal state is not Home",
isInState(() -> LauncherState.NORMAL));
executeOnLauncher(
@@ -168,14 +168,14 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
@ScreenRecord // b/195673272
public void testOverviewActions() throws Exception {
// Experimenting for b/165029151:
final Overview overview = mLauncher.pressHome().switchToOverview();
final Overview overview = mLauncher.goHome().switchToOverview();
if (overview.hasTasks()) overview.dismissAllTasks();
mLauncher.pressHome();
mLauncher.goHome();
//
startTestAppsWithCheck();
OverviewActions actionsView =
mLauncher.pressHome().switchToOverview().getOverviewActions();
mLauncher.goHome().switchToOverview().getOverviewActions();
actionsView.clickAndDismissScreenshot();
}
@@ -200,7 +200,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
@PortraitLandscape
public void testSwitchToOverview() throws Exception {
assertNotNull("Workspace.switchToOverview() returned null",
mLauncher.pressHome().switchToOverview());
mLauncher.goHome().switchToOverview());
assertTrue("Launcher internal state didn't switch to Overview",
isInState(() -> LauncherState.OVERVIEW));
}
@@ -240,7 +240,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
// Testing pressHome.
assertTrue("Launcher internal state is not All Apps",
isInState(() -> LauncherState.ALL_APPS));
assertNotNull("pressHome returned null", mLauncher.pressHome());
assertNotNull("pressHome returned null", mLauncher.goHome());
assertTrue("Launcher internal state is not Home",
isInState(() -> LauncherState.NORMAL));
assertNotNull("getHome returned null", mLauncher.getWorkspace());
@@ -289,7 +289,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
@PortraitLandscape
public void testQuickSwitchFromHome() throws Exception {
startTestActivity(2);
mLauncher.pressHome().quickSwitchToPreviousApp();
mLauncher.goHome().quickSwitchToPreviousApp();
assertTrue("The most recent task is not running after quick switching from home",
isTestActivityRunning(2));
getAndAssertLaunchedApp();
@@ -329,7 +329,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
startTestActivity(i);
}
Overview overview = mLauncher.pressHome().switchToOverview();
Overview overview = mLauncher.goHome().switchToOverview();
executeOnLauncher(
launcher -> assertTrue("Don't have at least 13 tasks",
getTaskCount(launcher) >= 13));
@@ -348,7 +348,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
DEFAULT_UI_TIMEOUT));
// Scroll the task offscreen as it is now first
overview = mLauncher.pressHome().switchToOverview();
overview = mLauncher.goHome().switchToOverview();
overview.scrollCurrentTaskOffScreen();
assertTrue("Launcher internal state is not Overview",
isInState(() -> LauncherState.OVERVIEW));
@@ -377,7 +377,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
launcher)) <= 1)));
// Test dismissing all tasks.
mLauncher.pressHome().switchToOverview().dismissAllTasks();
mLauncher.goHome().switchToOverview().dismissAllTasks();
assertTrue("Launcher internal state is not Home",
isInState(() -> LauncherState.NORMAL));
executeOnLauncher(

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

@@ -197,7 +197,7 @@ public class ViewInflationDuringSwipeUp extends AbstractQuickStepTest {
addItemToScreen(item);
assertTrue("Widget is not present",
mLauncher.pressHome().tryGetWidget(info.label, DEFAULT_UI_TIMEOUT) != null);
mLauncher.goHome().tryGetWidget(info.label, DEFAULT_UI_TIMEOUT) != null);
int widgetId = item.appWidgetId;
// Verify widget id
@@ -221,7 +221,7 @@ public class ViewInflationDuringSwipeUp extends AbstractQuickStepTest {
// Widget is updated when going home
mInitTracker.disableLog();
mLauncher.pressHome();
mLauncher.goHome();
verifyWidget(finalWidgetText);
assertNotEquals(1, mInitTracker.viewInitCount);
} finally {

6
tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
View File

@@ -109,7 +109,7 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest {
launcher -> assertNotNull("Launcher internal state didn't switch to Showing Menu",
launcher.getOptionsPopup()));
// Check that pressHome works when the menu is shown.
mLauncher.pressHome();
mLauncher.goHome();
}
@Test
@@ -121,7 +121,7 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest {
} finally {
allApps.unfreeze();
}
mLauncher.pressHome();
mLauncher.goHome();
}
public static void runAllAppsTest(AbstractLauncherUiTest test, AllApps allApps) {
@@ -273,7 +273,7 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest {
executeOnLauncher(launcher -> assertTrue("Flinging backward didn't scroll widgets",
getWidgetsScroll(launcher) < flingForwardY));
mLauncher.pressHome();
mLauncher.goHome();
waitForLauncherCondition("Widgets were not closed",
launcher -> getWidgetsView(launcher) == null);
}

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

@@ -169,7 +169,7 @@ public class RequestPinItemTest extends AbstractLauncherUiTest {
}
// Go back to home
mLauncher.pressHome();
mLauncher.goHome();
Wait.atMost("", new ItemSearchCondition(itemMatcher), DEFAULT_ACTIVITY_TIMEOUT,
mLauncher);
}

11
tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
View File

@@ -877,11 +877,22 @@ public final class LauncherInstrumentation {
}
/**
* @deprecated use goHome().
* Presses nav bar home button.
*
* @return the Workspace object.
*/
@Deprecated
public Workspace pressHome() {
return goHome();
}
/**
* Presses nav bar home button.
*
* @return the Workspace object.
*/
public Workspace goHome() {
try (LauncherInstrumentation.Closable e = eventsCheck();
LauncherInstrumentation.Closable c = addContextLayer("want to switch to home")) {
waitForLauncherInitialized();