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 "Revert "Make sure TAPL waits for Launcher activity to stop each time it stops"" into main

Browse Source
This commit is contained in:
Cliff Wang
2024-02-05 08:21:54 +00:00
committed by Android (Google) Code Review
parent 6474a3b455 ac82e995ca
commit dd2222749b
6 changed files with 1 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -599,9 +599,6 @@ public abstract class AbstractLauncherUiTest {
Wait.atMost("Launcher activity didn't stop",
() -> !launcherInstrumentation.isLauncherActivityStarted(),
DEFAULT_ACTIVITY_TIMEOUT, launcherInstrumentation);
// Reset activity stop count.
launcherInstrumentation.getAndResetActivityStopCount();
}
public static ActivityInfo resolveSystemAppInfo(String category) {

6
tests/multivalentTests/src/com/android/launcher3/util/rule/TestIsolationRule.java
View File

@@ -44,15 +44,11 @@ public class TestIsolationRule implements TestRule {
return new Statement() {
@Override
public void evaluate() throws Throwable {
// Reset activity stop count.
mLauncher.getAndResetActivityStopCount();
base.evaluate();
// Make sure that Launcher workspace looks correct.
UiDevice.getInstance(InstrumentationRegistry.getInstrumentation()).pressHome();
AbstractLauncherUiTest.checkDetectedLeaks(mLauncher, mRequireOneActiveActivity);
mLauncher.assertNoUnexpectedStops();
}
};
}