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

Commit fb97d92e authored by Andy Wickham's avatar Andy Wickham Committed by Android (Google) Code Review
Browse files

Merge "Ensure "AppIconSelector" does not match folders." into main

parents 0c8439e1 bfb7c269

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

+2 −1
Original line number Diff line number Diff line
@@ -42,7 +42,8 @@ public abstract class AppIcon extends Launchable { 
     * @param appName app icon to look for

     */

    static BySelector getAppIconSelector(String appName) {

        return By.clazz(TextView.class).text(makeMultilinePattern(appName));

        // focusable=true to avoid matching folder labels

        return By.clazz(TextView.class).text(makeMultilinePattern(appName)).focusable(true);

    }



    /**

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

+2 −2
Original line number Diff line number Diff line
@@ -56,8 +56,8 @@ public abstract class Launchable { 
     */

    public LaunchedAppState launch(String expectedPackageName) {

        try (LauncherInstrumentation.Closable e = mLauncher.eventsCheck()) {

            try (LauncherInstrumentation.Closable c1 = mLauncher.addContextLayer(

                    "want to launch an app from " + launchableType())) {

            try (LauncherInstrumentation.Closable c1 = mLauncher.addContextLayer(String.format(

                    "want to launch an app (%s) from %s", expectedPackageName, launchableType()))) {

                LauncherInstrumentation.log("Launchable.launch before click "

                        + mObject.getVisibleCenter() + " in "

                        + mLauncher.getVisibleBounds(mObject));