commit d6c00c71147d650e036aa79764d751fe9151dd74
author Brandon Dayauon <brdayauon@google.com> Wed Jul 26 22:51:55 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 26 22:51:55 2023 +0000
tree da865fe8f38099964632923bdda320060f28ebba
parent 06ca4d9c6ed4d1a19f0ad30554d8c12f21d72403
parent 19a380095e78c1c4ba8c73b6a86c4e5b1dcc9c04

Merge "enable flags: ENABLE_TWOLINE_ALLAPPS and ENABLE_TWOLINE_DEVICESEARCH" into udc-qpr-dev

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

diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 92e9902..d2f37fb 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -129,7 +129,7 @@
 
     // TODO(Block 5): Clean up flags
     public static final BooleanFlag ENABLE_TWOLINE_DEVICESEARCH = getDebugFlag(201388851,
-            "ENABLE_TWOLINE_DEVICESEARCH", TEAMFOOD,
+            "ENABLE_TWOLINE_DEVICESEARCH", ENABLED,
             "Enable two line label for icons with labels on device search.");
 
     public static final BooleanFlag ENABLE_ICON_IN_TEXT_HEADER = getDebugFlag(270395143,
@@ -227,7 +227,7 @@
             "COLLECT_SEARCH_HISTORY", DISABLED, "Allow launcher to collect search history for log");
 
     public static final BooleanFlag ENABLE_TWOLINE_ALLAPPS = getDebugFlag(270390937,
-            "ENABLE_TWOLINE_ALLAPPS", TEAMFOOD, "Enables two line label inside all apps.");
+            "ENABLE_TWOLINE_ALLAPPS", ENABLED, "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");