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

Merge "Improving diags for containers disappearing while getting children" into sc-v2-dev

This commit is contained in:
Android Build Prod User 2021-08-24 21:28:23 +00:00 committed by Android (Google) Code Review
parent 46e0999612 272d622bc4
commit 497a6ad826
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1033,6 +1033,15 @@ public final class LauncherInstrumentation {
}
}
List<UiObject2> getChildren(UiObject2 container) {
try {
return container.getChildren();
} catch (StaleObjectException e) {
fail("The container disappeared from screen");
return null;
}
}
private boolean hasLauncherObject(String resId) {
return mDevice.hasObject(getLauncherObjectSelector(resId));
}

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

@ -116,9 +116,9 @@ public final class Widgets extends LauncherInstrumentation.VisibleContainer {
"widget_preview");
int i = 0;
for (; ; ) {
final Collection<UiObject2> tableRows = widgetsContainer.getChildren();
final Collection<UiObject2> tableRows = mLauncher.getChildren(widgetsContainer);
for (UiObject2 row : tableRows) {
final Collection<UiObject2> widgetCells = row.getChildren();
final Collection<UiObject2> widgetCells = mLauncher.getChildren(row);
for (UiObject2 widget : widgetCells) {
final UiObject2 label = mLauncher.findObjectInContainer(widget,
labelSelector);