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

Merge "Waiting for NexusLauncher to go away after swiping up from menu" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-04-14 02:11:27 +00:00
committed by Android (Google) Code Review
parent 3aea671e4f 6a562d8cbe
commit 4e77d8f85f
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -365,7 +365,7 @@ public final class LauncherInstrumentation {
if (hasSystemUiObject("keyguard_status_view")) return "Phone is locked";
if (!mDevice.wait(Until.hasObject(By.textStartsWith("")), WAIT_TIME_MS)) {
if (!mDevice.wait(Until.hasObject(getAnyObjectSelector()), WAIT_TIME_MS)) {
return "Screen is empty";
}
@@ -388,7 +388,7 @@ public final class LauncherInstrumentation {
}
private String getVisiblePackages() {
return mDevice.findObjects(By.textStartsWith(""))
return mDevice.findObjects(getAnyObjectSelector())
.stream()
.map(LauncherInstrumentation::getApplicationPackageSafe)
.distinct()
@@ -692,6 +692,9 @@ public final class LauncherInstrumentation {
try (LauncherInstrumentation.Closable c = addContextLayer(
"Swiped up from context menu to home")) {
waitUntilLauncherObjectGone(CONTEXT_MENU_RES_ID);
// Swiping up can temporarily bring Nexus Launcher if the current
// Launcher is a Launcher3 one. Wait for the current launcher to reappear.
waitForLauncherObject(getAnyObjectSelector());
}
}
if (hasLauncherObject(WORKSPACE_RES_ID)) {
@@ -736,9 +739,13 @@ public final class LauncherInstrumentation {
}
}
private static BySelector getAnyObjectSelector() {
return By.textStartsWith("");
}
boolean isLauncherVisible() {
mDevice.waitForIdle();
return hasLauncherObject(By.textStartsWith(""));
return hasLauncherObject(getAnyObjectSelector());
}
/**