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

Commit 1ee28cd2 authored by Brandon Dayauon's avatar Brandon Dayauon Committed by Android (Google) Code Review
Browse files

Merge "ENABLE_TWOLINE_ALLAPPS default true (only in teamfood)" into udc-dev

parents 2e17bcaa 017e7a2e

src/com/android/launcher3/config/FeatureFlags.java

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ public final class FeatureFlags { 
            "COLLECT_SEARCH_HISTORY", DISABLED, "Allow launcher to collect search history for log");



    public static final BooleanFlag ENABLE_TWOLINE_ALLAPPS = getDebugFlag(270390937,

            "ENABLE_TWOLINE_ALLAPPS", DISABLED, "Enables two line label inside all apps.");

            "ENABLE_TWOLINE_ALLAPPS", TEAMFOOD, "Enables two line label inside all apps.");



    public static final BooleanFlag IME_STICKY_SNACKBAR_EDU = getDebugFlag(270391693,

            "IME_STICKY_SNACKBAR_EDU", ENABLED, "Show sticky IME edu in AllApps");

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

+2 −1
Original line number Diff line number Diff line
@@ -37,7 +37,8 @@ public abstract class AppIcon extends Launchable { 
    }



    static BySelector getAppIconSelector(String appName, LauncherInstrumentation launcher) {

        return By.clazz(TextView.class).text(appName).pkg(launcher.getLauncherPackageName());

        return By.clazz(TextView.class).textContains(appName)

                .pkg(launcher.getLauncherPackageName());

    }



    static BySelector getAnyAppIconSelector() {