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

Merge "Fix tapl tests for overview actions in fallback recents." into sc-v2-dev am: 22d7524f53

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16182391

Change-Id: Iedec936c8c9c904b2be13d4589958b0ccc5f9a73
This commit is contained in:
Alex Chau
2021-11-25 18:16:18 +00:00
committed by Automerger Merge Worker
parent 6b17728794 22d7524f53
commit eb6be24779
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -212,7 +212,7 @@ public class BaseOverview extends LauncherInstrumentation.VisibleContainer {
try (LauncherInstrumentation.Closable c = mLauncher.addContextLayer(
"want to get overview actions")) {
verifyActiveContainer();
UiObject2 overviewActions = mLauncher.waitForLauncherObject("action_buttons");
UiObject2 overviewActions = mLauncher.waitForOverviewObject("action_buttons");
return new OverviewActions(overviewActions, mLauncher);
}
}
@@ -224,19 +224,16 @@ public class BaseOverview extends LauncherInstrumentation.VisibleContainer {
return mLauncher.hasLauncherObject(mLauncher.getOverviewObjectSelector("clear_all"));
}
/* TODO(b/197630182): Once b/188790554 is fixed, remove instanceof check. Currently, when
swiping from app to overview in Fallback Recents, taskbar remains and no action buttons
are visible, so we are only testing Overview for now, not BaseOverview. */
private void verifyActionsViewVisibility() {
if (!(this instanceof Overview) || !hasTasks()) {
if (!hasTasks()) {
return;
}
try (LauncherInstrumentation.Closable c = mLauncher.addContextLayer(
"want to assert overview actions view visibility")) {
if (mLauncher.isTablet() && !isOverviewSnappedToFocusedTaskForTablet()) {
mLauncher.waitUntilLauncherObjectGone("action_buttons");
mLauncher.waitUntilOverviewObjectGone("action_buttons");
} else {
mLauncher.waitForLauncherObject("action_buttons");
mLauncher.waitForOverviewObject("action_buttons");
}
}
}

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

@@ -1029,6 +1029,10 @@ public final class LauncherInstrumentation {
waitUntilGoneBySelector(getLauncherObjectSelector(resId));
}
void waitUntilOverviewObjectGone(String resId) {
waitUntilGoneBySelector(getOverviewObjectSelector(resId));
}
void waitUntilLauncherObjectGone(BySelector selector) {
waitUntilGoneBySelector(makeLauncherSelector(selector));
}