diff --git a/src/com/android/launcher3/LauncherAppState.java b/src/com/android/launcher3/LauncherAppState.java index dabbdd3063..b3d096c4b8 100644 --- a/src/com/android/launcher3/LauncherAppState.java +++ b/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); diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java index 40dcb1e66a..ab72a077a1 100644 --- a/src/com/android/launcher3/config/FeatureFlags.java +++ b/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"); diff --git a/src/com/android/launcher3/icons/IconCache.java b/src/com/android/launcher3/icons/IconCache.java index 8e0a388784..cd13cd0ec5 100644 --- a/src/com/android/launcher3/icons/IconCache.java +++ b/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); } /**