PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Winson Chung
2015-08-03 22:14:53 +00:00
committed by Android (Google) Code Review
parent 6eeab68fd4 88fa741e50
commit 153b02a5e6
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/Launcher.java
+1 -1
View File
@@ -4101,7 +4101,7 @@ public class Launcher extends Activity
return mDeviceProfile.getSearchBarBounds(Utilities.isRtl(getResources())); return mDeviceProfile.getSearchBarBounds(Utilities.isRtl(getResources()));
} }
public void bindSearchablesChanged() { public void bindSearchProviderChanged() {
if (mSearchDropTargetBar == null) { if (mSearchDropTargetBar == null) {
return; return;
} }
src/com/android/launcher3/LauncherAppState.java
-1
View File
@@ -95,7 +95,6 @@ public class LauncherAppState {
IntentFilter filter = new IntentFilter(); IntentFilter filter = new IntentFilter();
filter.addAction(Intent.ACTION_LOCALE_CHANGED); filter.addAction(Intent.ACTION_LOCALE_CHANGED);
filter.addAction(SearchManager.INTENT_GLOBAL_SEARCH_ACTIVITY_CHANGED); filter.addAction(SearchManager.INTENT_GLOBAL_SEARCH_ACTIVITY_CHANGED);
filter.addAction(SearchManager.INTENT_ACTION_SEARCHABLES_CHANGED);
// For handling managed profiles // For handling managed profiles
filter.addAction(LauncherAppsCompat.ACTION_MANAGED_PROFILE_ADDED); filter.addAction(LauncherAppsCompat.ACTION_MANAGED_PROFILE_ADDED);
filter.addAction(LauncherAppsCompat.ACTION_MANAGED_PROFILE_REMOVED); filter.addAction(LauncherAppsCompat.ACTION_MANAGED_PROFILE_REMOVED);
src/com/android/launcher3/LauncherModel.java
+3 -4
View File
@@ -204,7 +204,7 @@ public class LauncherModel extends BroadcastReceiver
public void bindComponentsRemoved(ArrayList<String> packageNames, public void bindComponentsRemoved(ArrayList<String> packageNames,
ArrayList<AppInfo> appInfos, UserHandleCompat user, int reason); ArrayList<AppInfo> appInfos, UserHandleCompat user, int reason);
public void bindAllPackages(WidgetsModel model); public void bindAllPackages(WidgetsModel model);
public void bindSearchablesChanged(); public void bindSearchProviderChanged();
public boolean isAllAppsButtonRank(int rank); public boolean isAllAppsButtonRank(int rank);
public void onPageBoundSynchronously(int page); public void onPageBoundSynchronously(int page);
public void dumpLogsToLocalData(); public void dumpLogsToLocalData();
@@ -1281,11 +1281,10 @@ public class LauncherModel extends BroadcastReceiver
if (Intent.ACTION_LOCALE_CHANGED.equals(action)) { if (Intent.ACTION_LOCALE_CHANGED.equals(action)) {
// If we have changed locale we need to clear out the labels in all apps/workspace. // If we have changed locale we need to clear out the labels in all apps/workspace.
forceReload(); forceReload();
} else if (SearchManager.INTENT_GLOBAL_SEARCH_ACTIVITY_CHANGED.equals(action) || } else if (SearchManager.INTENT_GLOBAL_SEARCH_ACTIVITY_CHANGED.equals(action)) {
SearchManager.INTENT_ACTION_SEARCHABLES_CHANGED.equals(action)) {
Callbacks callbacks = getCallback(); Callbacks callbacks = getCallback();
if (callbacks != null) { if (callbacks != null) {
callbacks.bindSearchablesChanged(); callbacks.bindSearchProviderChanged();
} }
} else if (LauncherAppsCompat.ACTION_MANAGED_PROFILE_ADDED.equals(action) } else if (LauncherAppsCompat.ACTION_MANAGED_PROFILE_ADDED.equals(action)
|| LauncherAppsCompat.ACTION_MANAGED_PROFILE_REMOVED.equals(action)) { || LauncherAppsCompat.ACTION_MANAGED_PROFILE_REMOVED.equals(action)) {