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

Merge "Waiting for Launcher activity to stop when starting a Launchable into split screen" into main

Browse Source
This commit is contained in:
Vadim Tryshev
2023-12-28 19:26:43 +00:00
committed by Android (Google) Code Review
parent 2c385bec7b 42636b95ed
commit ff03dd19c7
1 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
tests/tapl/com/android/launcher3/tapl/Launchable.java
View File

@@ -16,8 +16,6 @@
package com.android.launcher3.tapl;
import static android.view.accessibility.AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED;
import static com.android.launcher3.testing.shared.TestProtocol.SPRING_LOADED_STATE_ORDINAL;
import android.graphics.Point;
@@ -64,13 +62,7 @@ public abstract class Launchable {
+ mObject.getVisibleCenter() + " in "
+ mLauncher.getVisibleBounds(mObject));
if (launcherStopsAfterLaunch()) {
mLauncher.executeAndWaitForLauncherStop(
() -> mLauncher.clickLauncherObject(mObject),
"clicking the launchable");
} else {
mLauncher.clickLauncherObject(mObject);
}
performClick();
try (LauncherInstrumentation.Closable c2 = mLauncher.addContextLayer("clicked")) {
expectActivityStartEvents();
@@ -80,6 +72,16 @@ public abstract class Launchable {
}
}
private void performClick() {
if (launcherStopsAfterLaunch()) {
mLauncher.executeAndWaitForLauncherStop(
() -> mLauncher.clickLauncherObject(mObject),
"clicking the launchable");
} else {
mLauncher.clickLauncherObject(mObject);
}
}
protected abstract void expectActivityStartEvents();
protected abstract String launchableType();
@@ -97,12 +99,8 @@ public abstract class Launchable {
LauncherInstrumentation.log("Launchable.launch before click "
+ mObject.getVisibleCenter() + " in " + mLauncher.getVisibleBounds(
mObject));
mLauncher.executeAndWaitForLauncherEvent(
() -> mLauncher.clickLauncherObject(mObject),
accessibilityEvent ->
accessibilityEvent.getEventType() == TYPE_WINDOW_STATE_CHANGED,
() -> "Unable to click object to launch split",
"Click launcher object to launch split");
performClick();
try (LauncherInstrumentation.Closable c2 = mLauncher.addContextLayer("clicked")) {
mLauncher.expectEvent(TestProtocol.SEQUENCE_MAIN, OverviewTask.SPLIT_START_EVENT);