Removing LauncherCallbacks control over app search

am: c42ac0a5a6

* commit 'c42ac0a5a6f0a4e41a9fc1b694f841204ae1989c':
  Removing LauncherCallbacks control over app search
This commit is contained in:
Sunny Goyal
2016-02-18 23:50:51 +00:00
committed by android-build-merger
3 changed files with 2 additions and 10 deletions
-9
View File
@@ -2138,15 +2138,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();
}
@@ -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();
@@ -498,7 +498,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);