Merge "Remove APP_SEARCH_IMPROVEMENTS" into sc-dev am: 9450883e74

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14829362

Change-Id: Id83670f5fbb70af1dd774025829b5fe301389936

src/com/android/launcher3/LauncherAppState.java

@@ -99,8 +99,6 @@ public class LauncherAppState {
         }
         mOnTerminateCallback.add(() -> mContext.unregisterReceiver(modelChangeReceiver));
 
-        // TODO: remove listener on terminate
-        FeatureFlags.APP_SEARCH_IMPROVEMENTS.addChangeListener(context, mModel::forceReload);
         CustomWidgetManager.INSTANCE.get(mContext)
                 .setWidgetRefreshCallback(mModel::refreshAndBindWidgetsAndShortcuts);
 

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

@@ -111,10 +111,6 @@ public final class FeatureFlags {
             "FOLDER_NAME_MAJORITY_RANKING", true,
             "Suggests folder names based on majority based ranking.");
 
-    public static final BooleanFlag APP_SEARCH_IMPROVEMENTS = new DeviceFlag(
-            "APP_SEARCH_IMPROVEMENTS", true,
-            "Adds localized title and keyword search and ranking");
-
     public static final BooleanFlag ENABLE_PREDICTION_DISMISS = getDebugFlag(
             "ENABLE_PREDICTION_DISMISS", true, "Allow option to dimiss apps from predicted list");
 

src/com/android/launcher3/icons/IconCache.java

@@ -336,8 +336,7 @@ public class IconCache extends BaseIconCache {
 
     @Override
     protected String getIconSystemState(String packageName) {
-        return mIconProvider.getSystemStateForPackage(mSystemState, packageName)
-                + ",flags_asi:" + FeatureFlags.APP_SEARCH_IMPROVEMENTS.get();
+        return mIconProvider.getSystemStateForPackage(mSystemState, packageName);
     }
 
     /**