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

Commit 153b02a5 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Remove handler for searchables changed broadcast." into ub-launcher3-burnaby

parents 6eeab68f 88fa741e

src/com/android/launcher3/Launcher.java

+1 −1
Original line number Diff line number Diff line
@@ -4101,7 +4101,7 @@ public class Launcher extends Activity 
        return mDeviceProfile.getSearchBarBounds(Utilities.isRtl(getResources()));

    }



    public void bindSearchablesChanged() {

    public void bindSearchProviderChanged() {

        if (mSearchDropTargetBar == null) {

            return;

        }

src/com/android/launcher3/LauncherAppState.java

+0 −1
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ public class LauncherAppState { 
        IntentFilter filter = new IntentFilter();

        filter.addAction(Intent.ACTION_LOCALE_CHANGED);

        filter.addAction(SearchManager.INTENT_GLOBAL_SEARCH_ACTIVITY_CHANGED);

        filter.addAction(SearchManager.INTENT_ACTION_SEARCHABLES_CHANGED);

        // For handling managed profiles

        filter.addAction(LauncherAppsCompat.ACTION_MANAGED_PROFILE_ADDED);

        filter.addAction(LauncherAppsCompat.ACTION_MANAGED_PROFILE_REMOVED);

src/com/android/launcher3/LauncherModel.java

+3 −4
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ public class LauncherModel extends BroadcastReceiver 
        public void bindComponentsRemoved(ArrayList<String> packageNames,

                        ArrayList<AppInfo> appInfos, UserHandleCompat user, int reason);

        public void bindAllPackages(WidgetsModel model);

        public void bindSearchablesChanged();

        public void bindSearchProviderChanged();

        public boolean isAllAppsButtonRank(int rank);

        public void onPageBoundSynchronously(int page);

        public void dumpLogsToLocalData();
@@ -1281,11 +1281,10 @@ public class LauncherModel extends BroadcastReceiver 
        if (Intent.ACTION_LOCALE_CHANGED.equals(action)) {

            // If we have changed locale we need to clear out the labels in all apps/workspace.

            forceReload();

        } else if (SearchManager.INTENT_GLOBAL_SEARCH_ACTIVITY_CHANGED.equals(action) ||

                   SearchManager.INTENT_ACTION_SEARCHABLES_CHANGED.equals(action)) {

        } else if (SearchManager.INTENT_GLOBAL_SEARCH_ACTIVITY_CHANGED.equals(action)) {

            Callbacks callbacks = getCallback();

            if (callbacks != null) {

                callbacks.bindSearchablesChanged();

                callbacks.bindSearchProviderChanged();

            }

        } else if (LauncherAppsCompat.ACTION_MANAGED_PROFILE_ADDED.equals(action)

                || LauncherAppsCompat.ACTION_MANAGED_PROFILE_REMOVED.equals(action)) {