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

Commit 4b972af5 authored by Tracy Zhou's avatar Tracy Zhou Committed by Android (Google) Code Review
Browse files

Merge "Fix overview actions tapl test failure" into tm-qpr-dev

parents ee3ef1e9 8bcac711

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

+10 −0
Original line number Diff line number Diff line
@@ -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 {

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

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

    }

}