aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-28 07:46:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Improving diags for containers disappearing while getting children" into sc-v2-dev am: 497a6ad826

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

Change-Id: I5231bf1ca4f01da14aa73b19c19b724a0eb446d6
This commit is contained in:
Android Build Prod User
2021-08-24 21:36:29 +00:00
committed by Automerger Merge Worker
parent 576d233f90 497a6ad826
commit 05e0d86c73
2 changed files with 11 additions and 2 deletions
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);