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

Commit 9450883e authored by Hyunyoung Song's avatar Hyunyoung Song Committed by Android (Google) Code Review
Browse files

Merge "Remove APP_SEARCH_IMPROVEMENTS" into sc-dev

parents a5a61ddd 2e747e21

src/com/android/launcher3/LauncherAppState.java

+0 −2
Original line number Original line Diff line number Diff line
@@ -99,8 +99,6 @@ public class LauncherAppState { 
        }

        }

        mOnTerminateCallback.add(() -> mContext.unregisterReceiver(modelChangeReceiver));

        mOnTerminateCallback.add(() -> mContext.unregisterReceiver(modelChangeReceiver));





        // TODO: remove listener on terminate

        FeatureFlags.APP_SEARCH_IMPROVEMENTS.addChangeListener(context, mModel::forceReload);

        CustomWidgetManager.INSTANCE.get(mContext)

        CustomWidgetManager.INSTANCE.get(mContext)

                .setWidgetRefreshCallback(mModel::refreshAndBindWidgetsAndShortcuts);

                .setWidgetRefreshCallback(mModel::refreshAndBindWidgetsAndShortcuts);

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

+0 −4
Original line number Original line Diff line number Diff line
@@ -111,10 +111,6 @@ public final class FeatureFlags { 
            "FOLDER_NAME_MAJORITY_RANKING", true,

            "FOLDER_NAME_MAJORITY_RANKING", true,

            "Suggests folder names based on majority based ranking.");

            "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(

    public static final BooleanFlag ENABLE_PREDICTION_DISMISS = getDebugFlag(

            "ENABLE_PREDICTION_DISMISS", true, "Allow option to dimiss apps from predicted list");

            "ENABLE_PREDICTION_DISMISS", true, "Allow option to dimiss apps from predicted list");

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

+1 −2
Original line number Original line Diff line number Diff line
@@ -336,8 +336,7 @@ public class IconCache extends BaseIconCache { 




    @Override

    @Override

    protected String getIconSystemState(String packageName) {

    protected String getIconSystemState(String packageName) {

        return mIconProvider.getSystemStateForPackage(mSystemState, packageName)

        return mIconProvider.getSystemStateForPackage(mSystemState, packageName);

                + ",flags_asi:" + FeatureFlags.APP_SEARCH_IMPROVEMENTS.get();

    }

    }





    /**

    /**