am 153b02a5: Merge "Remove handler for searchables changed broadcast." into ub-launcher3-burnaby

* commit '153b02a5e69c99b1154eea107da6b2fba4c6f3a3':
  Remove handler for searchables changed broadcast.
This commit is contained in:
Winson Chung
2015-08-03 22:20:10 +00:00
committed by Android Git Automerger
3 changed files with 4 additions and 6 deletions

View File

@@ -205,7 +205,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();
@@ -1277,11 +1277,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)) {