Update AllApps search TAPL APIs support for system back and dismiss.

Design doc: go/toasty-taskbar-tapl

Test: Compiles
Bug: 295366997
Flag: Not needed
Change-Id: I87b0b16c83eefc7e997cfd35901c788853aa9988
This commit is contained in:
Brian Isganitis
2023-08-14 15:58:06 -04:00
parent 97249c5318
commit e6038a7e05
3 changed files with 19 additions and 2 deletions
@@ -91,7 +91,7 @@ public class SearchResultFromQsb {
* Taps outside bottom sheet to dismiss and return to workspace. Available on tablets only.
* @param tapRight Tap on the right of bottom sheet if true, or left otherwise.
*/
public Workspace dismissByTappingOutsideForTablet(boolean tapRight) {
public void dismissByTappingOutsideForTablet(boolean tapRight) {
try (LauncherInstrumentation.Closable e = mLauncher.eventsCheck();
LauncherInstrumentation.Closable c = mLauncher.addContextLayer(
"want to tap outside AllApps bottom sheet on the "
@@ -101,8 +101,12 @@ public class SearchResultFromQsb {
mLauncher.touchOutsideContainer(allAppsBottomSheet, tapRight);
try (LauncherInstrumentation.Closable tapped = mLauncher.addContextLayer(
"tapped outside AllApps bottom sheet")) {
return mLauncher.getWorkspace();
verifyVisibleContainerOnDismiss();
}
}
}
protected void verifyVisibleContainerOnDismiss() {
mLauncher.getWorkspace();
}
}
@@ -45,4 +45,9 @@ public class SearchResultFromTaskbarQsb extends SearchResultFromQsb {
protected TaskbarSearchWebSuggestion createWebSuggestion(UiObject2 webSuggestion) {
return new TaskbarSearchWebSuggestion(mLauncher, webSuggestion);
}
@Override
protected void verifyVisibleContainerOnDismiss() {
mLauncher.getLaunchedAppState().assertTaskbarVisible();
}
}
@@ -101,6 +101,14 @@ public final class Taskbar {
mLauncher.waitForSystemLauncherObject(TASKBAR_RES_ID),
getAllAppsButtonSelector()));
return getAllApps();
}
}
/** Returns {@link TaskbarAllApps} if it is open, otherwise fails. */
public TaskbarAllApps getAllApps() {
try (LauncherInstrumentation.Closable c = mLauncher.addContextLayer(
"want to get taskbar all apps object")) {
return new TaskbarAllApps(mLauncher);
}
}