diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2016-02-18 15:31:55 -0800 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2016-02-18 15:32:27 -0800 |
| commit | c42ac0a5a6f0a4e41a9fc1b694f841204ae1989c (patch) | |
| tree | 29ce9528f09a7bb242caca6bf3595a30fbc94284 /src | |
| parent | 2953833bcba6c4aba3c5211bfb41434321ce255f (diff) | |
| download | android_packages_apps_Trebuchet-c42ac0a5a6f0a4e41a9fc1b694f841204ae1989c.tar.gz android_packages_apps_Trebuchet-c42ac0a5a6f0a4e41a9fc1b694f841204ae1989c.tar.bz2 android_packages_apps_Trebuchet-c42ac0a5a6f0a4e41a9fc1b694f841204ae1989c.zip | |
Removing LauncherCallbacks control over app search
Change-Id: Icb199607dea3f169055e44946272aa9f1e758d1d
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 9 | ||||
| -rw-r--r-- | src/com/android/launcher3/LauncherCallbacks.java | 1 | ||||
| -rw-r--r-- | src/com/android/launcher3/allapps/AllAppsGridAdapter.java | 2 |
3 files changed, 2 insertions, 10 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index edb7c14bc..166acd33b 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -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(); } diff --git a/src/com/android/launcher3/LauncherCallbacks.java b/src/com/android/launcher3/LauncherCallbacks.java index f27ed1da9..772fbf358 100644 --- a/src/com/android/launcher3/LauncherCallbacks.java +++ b/src/com/android/launcher3/LauncherCallbacks.java @@ -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(); diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java index 748c7491a..cfaf19515 100644 --- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java +++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java @@ -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); |