Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 497a6ad8 authored by Android Build Prod User's avatar Android Build Prod User Committed by Android (Google) Code Review
Browse files

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

parents 46e09996 272d622b

tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java

+9 −0
Original line number Diff line number Diff line
@@ -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));

    }

tests/tapl/com/android/launcher3/tapl/Widgets.java

+2 −2
Original line number Diff line number Diff line
@@ -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);