From 017e7a2e06d0e351fcd9ca6c86af8b19017aaa88 Mon Sep 17 00:00:00 2001 From: Brandon Dayauon Date: Tue, 25 Apr 2023 19:27:55 -0700 Subject: [PATCH] ENABLE_TWOLINE_ALLAPPS default true (only in teamfood) - modified test so enabling two line all apps work - have appIconSelector() select from content description bug: 275116822 test: manual Change-Id: Id3ccc6859b55d6b8a80ca509d420409d484207cf --- src/com/android/launcher3/config/FeatureFlags.java | 2 +- tests/tapl/com/android/launcher3/tapl/AppIcon.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java index cdebe440a1..f8017b8391 100644 --- a/src/com/android/launcher3/config/FeatureFlags.java +++ b/src/com/android/launcher3/config/FeatureFlags.java @@ -246,7 +246,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"); diff --git a/tests/tapl/com/android/launcher3/tapl/AppIcon.java b/tests/tapl/com/android/launcher3/tapl/AppIcon.java index 2687b28bcb..0a0cf07482 100644 --- a/tests/tapl/com/android/launcher3/tapl/AppIcon.java +++ b/tests/tapl/com/android/launcher3/tapl/AppIcon.java @@ -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() {