commit c42ac0a5a6f0a4e41a9fc1b694f841204ae1989c
author Sunny Goyal <sunnygoyal@google.com> Thu Feb 18 15:31:55 2016 -0800
committer Sunny Goyal <sunnygoyal@google.com> Thu Feb 18 15:32:27 2016 -0800
tree 29ce9528f09a7bb242caca6bf3595a30fbc94284
parent 2953833bcba6c4aba3c5211bfb41434321ce255f

Removing LauncherCallbacks control over app search

Change-Id: Icb199607dea3f169055e44946272aa9f1e758d1d

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index edb7c14..166acd3 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2166,15 +2166,6 @@
         }
     }
 
-    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();
     }

src/com/android/launcher3/LauncherCallbacks.java

diff --git a/src/com/android/launcher3/LauncherCallbacks.java b/src/com/android/launcher3/LauncherCallbacks.java
index f27ed1d..772fbf3 100644
--- a/src/com/android/launcher3/LauncherCallbacks.java
+++ b/src/com/android/launcher3/LauncherCallbacks.java
@@ -77,6 +77,7 @@
     public boolean providesSearch();
     public boolean startSearch(String initialQuery, boolean selectInitialQuery,
             Bundle appSearchData, Rect sourceBounds);
+    @Deprecated
     public boolean startSearchFromAllApps(String query);
     @Deprecated
     public void startVoice();

src/com/android/launcher3/allapps/AllAppsGridAdapter.java

diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
index 748c749..cfaf195 100644
--- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
+++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
@@ -499,7 +499,7 @@
                 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);