Merge "Fix overview actions tapl test failure" into tm-qpr-dev am: 4b972af5be

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

Change-Id: I7a6bc3832bd70898f5ac4147622541284aae1bf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tracy Zhou
2022-08-12 20:43:44 +00:00
committed by Automerger Merge Worker
2 changed files with 11 additions and 1 deletions

View File

@@ -1123,6 +1123,16 @@ public final class LauncherInstrumentation {
return object;
}
@Nullable
UiObject2 findObjectInContainer(UiObject2 container, String resName) {
try {
return container.findObject(getLauncherObjectSelector(resName));
} catch (StaleObjectException e) {
fail("The container disappeared from screen");
return null;
}
}
@Nullable
UiObject2 findObjectInContainer(UiObject2 container, BySelector selector) {
try {

View File

@@ -182,6 +182,6 @@ public final class OverviewTask {
}
boolean isTaskSplit() {
return mTask.hasObject(By.res("bottomright_snapshot"));
return mLauncher.findObjectInContainer(mTask.getParent(), "bottomright_snapshot") != null;
}
}