Removing LauncherCallbacks control over app search

Change-Id: Icb199607dea3f169055e44946272aa9f1e758d1d
This commit is contained in:
Sunny Goyal
2016-02-18 15:31:55 -08:00
parent 2953833bcb
commit c42ac0a5a6
3 changed files with 2 additions and 10 deletions

View File

@@ -2166,15 +2166,6 @@ public class Launcher extends Activity
}
}
public void startSearchFromAllApps(View v, Intent searchIntent, String searchQuery) {
if (mLauncherCallbacks != null && mLauncherCallbacks.startSearchFromAllApps(searchQuery)) {
return;
}
// If not handled, then just start the provided search intent
startActivitySafely(v, searchIntent, null);
}
public boolean isOnCustomContent() {
return mWorkspace.isOnOrMovingToCustomContent();
}

View File

@@ -77,6 +77,7 @@ public interface LauncherCallbacks {
public boolean providesSearch();
public boolean startSearch(String initialQuery, boolean selectInitialQuery,
Bundle appSearchData, Rect sourceBounds);
@Deprecated
public boolean startSearchFromAllApps(String query);
@Deprecated
public void startVoice();

View File

@@ -499,7 +499,7 @@ public class AllAppsGridAdapter extends RecyclerView.Adapter<AllAppsGridAdapter.
searchMarketView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
mLauncher.startSearchFromAllApps(v, mMarketSearchIntent, mLastSearchQuery);
mLauncher.startActivitySafely(v, mMarketSearchIntent, null);
}
});
return new ViewHolder(searchMarketView);