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

Waiting for the state to settle after clear-all-tasks action

Browse Source 
Bug: 313926097
Flag: N/A
Test: presubmit
Change-Id: Idbbf48d5814fa457b3542ff972bfb86d31f04377
This commit is contained in:
Vadim Tryshev
2023-12-31 13:33:51 -08:00
parent ff03dd19c7
commit b4ff22754a
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
View File

@@ -280,7 +280,6 @@ public class FallbackRecentsTest {
// Test dismissing all tasks.
pressHomeAndGoToOverview().dismissAllTasks();
waitForRecentsActivityStop(); // dismissAllTasks() will close Recents
assertTrue("Fallback Launcher not visible", TestHelpers.wait(Until.hasObject(By.pkg(
mOtherLauncherActivity.packageName).text(FALLBACK_LAUNCHER_TITLE)), WAIT_TIME_MS));
}

16
tests/tapl/com/android/launcher3/tapl/BaseOverview.java
View File

@@ -17,6 +17,7 @@
package com.android.launcher3.tapl;
import static com.android.launcher3.tapl.LauncherInstrumentation.TASKBAR_RES_ID;
import static com.android.launcher3.testing.shared.TestProtocol.NORMAL_STATE_ORDINAL;
import android.graphics.Rect;
@@ -128,8 +129,19 @@ public class BaseOverview extends LauncherInstrumentation.VisibleContainer {
flingForwardImpl();
}
mLauncher.clickLauncherObject(
mLauncher.waitForObjectInContainer(verifyActiveContainer(), clearAllSelector));
final Runnable clickClearAll = () -> mLauncher.clickLauncherObject(
mLauncher.waitForObjectInContainer(verifyActiveContainer(),
clearAllSelector));
if (mLauncher.is3PLauncher()) {
mLauncher.executeAndWaitForLauncherStop(
clickClearAll,
"clicking 'Clear All'");
} else {
mLauncher.runToState(
clickClearAll,
NORMAL_STATE_ORDINAL,
"clicking 'Clear All'");
}
mLauncher.waitUntilLauncherObjectGone(clearAllSelector);
}