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

Commit e389a856 authored by Helen Cheuk's avatar Helen Cheuk Committed by Android (Google) Code Review
Browse files

Merge "Use correct resource id for verifying launching Lens from PSB" into main

parents f6c62955 dcb702fe

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

+6 −3
Original line number Original line Diff line number Diff line
@@ -22,6 +22,8 @@ import androidx.test.uiautomator.BySelector; 
import androidx.test.uiautomator.UiObject2;

import androidx.test.uiautomator.UiObject2;

import androidx.test.uiautomator.Until;

import androidx.test.uiautomator.Until;





import java.util.regex.Pattern;



/**

/**

 * Operations on qsb from either Home screen or AllApp screen.

 * Operations on qsb from either Home screen or AllApp screen.

 */

 */
@@ -30,7 +32,8 @@ public abstract class Qsb implements SearchInputSource { 
    private static final String ASSISTANT_APP_PACKAGE = "com.google.android.googlequicksearchbox";

    private static final String ASSISTANT_APP_PACKAGE = "com.google.android.googlequicksearchbox";

    private static final String ASSISTANT_ICON_RES_ID = "mic_icon";

    private static final String ASSISTANT_ICON_RES_ID = "mic_icon";

    private static final String LENS_ICON_RES_ID = "lens_icon";

    private static final String LENS_ICON_RES_ID = "lens_icon";

    private static final String LENS_APP_TEXT_RES_ID = "lens_camera_cutout_text";

    private static final Pattern LENS_APP_RES_PATTERN = Pattern.compile(

            ASSISTANT_APP_PACKAGE + ":id/lens.*");

    protected final LauncherInstrumentation mLauncher;

    protected final LauncherInstrumentation mLauncher;

    private final UiObject2 mContainer;

    private final UiObject2 mContainer;

    private final String mQsbResName;

    private final String mQsbResName;
@@ -96,8 +99,8 @@ public abstract class Qsb implements SearchInputSource { 
            try (LauncherInstrumentation.Closable c2 = mLauncher.addContextLayer("clicked")) {

            try (LauncherInstrumentation.Closable c2 = mLauncher.addContextLayer("clicked")) {

                // Package name is not enough to check if the app is launched, because many

                // Package name is not enough to check if the app is launched, because many

                // elements are having googlequicksearchbox as package name. So it checks if the

                // elements are having googlequicksearchbox as package name. So it checks if the

                // corresponding text resource is displayed

                // corresponding app resource is displayed

                BySelector selector = By.res(ASSISTANT_APP_PACKAGE, LENS_APP_TEXT_RES_ID);

                BySelector selector = By.res(LENS_APP_RES_PATTERN);

                mLauncher.assertTrue(

                mLauncher.assertTrue(

                        "Lens app didn't start: (" + selector + ")",

                        "Lens app didn't start: (" + selector + ")",

                        mLauncher.getDevice().wait(Until.hasObject(selector),

                        mLauncher.getDevice().wait(Until.hasObject(selector),