openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix tapl tests for overview actions in fallback recents. 

Note: fallback recents test may still fail manual testing if using flag SEPARATE_RECENTS_ACTIVITY

Test: FallbackRecentsTest.java
Bug: 197630182
Change-Id: Id18184e1f6271337adceacc9bac583d84e83afed
This commit is contained in:
Pat Manning 2021-11-03 13:36:31 +00:00
parent 3c2298668a
commit 4433db800c
2 changed files with 8 additions and 7 deletions
Show Stats 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));
}