commit f51084c29643929849d6ee903be9f9071e77f4b6
author Sunny Goyal <sunnygoyal@google.com> Thu Feb 18 00:40:49 2016 +0000
committer Sunny Goyal <sunnygoyal@google.com> Thu Feb 18 00:40:49 2016 +0000
tree 9d970b25899cbb96e61874d1941e2572a6bcf1a1
parent 954b7d36b96190b5b81e1784aaa5bb40057a8bca

Revert "Temporarily disabling custom search controller"

This reverts commit 954b7d36b96190b5b81e1784aaa5bb40057a8bca.

Change-Id: If304fa164e50f68aac168ede0f4bc0ff97659a8a

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index d9217e8..7330712 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1377,14 +1377,11 @@
         // Setup Apps and Widgets
         mAppsView = (AllAppsContainerView) findViewById(R.id.apps_view);
         mWidgetsView = (WidgetsContainerView) findViewById(R.id.widgets_view);
-        mAppsView.setSearchBarController(new DefaultAppSearchController());
-
-        // TODO: Reenable this
-//        if (mLauncherCallbacks != null && mLauncherCallbacks.getAllAppsSearchBarController() != null) {
-//            mAppsView.setSearchBarController(mLauncherCallbacks.getAllAppsSearchBarController());
-//        } else {
-//            mAppsView.setSearchBarController(new DefaultAppSearchController());
-//        }
+        if (mLauncherCallbacks != null && mLauncherCallbacks.getAllAppsSearchBarController() != null) {
+            mAppsView.setSearchBarController(mLauncherCallbacks.getAllAppsSearchBarController());
+        } else {
+            mAppsView.setSearchBarController(new DefaultAppSearchController());
+        }
 
         // Setup the drag controller (drop targets have to be added in reverse order in priority)
         dragController.setDragScoller(mWorkspace);