commit 0ac7ede56afebe4401c0636196f5844be573ad68
author Sunny Goyal <sunnygoyal@google.com> Fri Jan 29 13:14:14 2016 -0800
committer Sunny Goyal <sunnygoyal@google.com> Mon Feb 08 14:55:22 2016 -0800
tree c4bdfce0b5f788880354845ab51ae293bd608d1b
parent 0e0498031092488ff166145c12ce36cc0a80c490

Merging search bar with all apps

Change-Id: I78577124cd3c05d52669c3e52b0294d6eb1d194d

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 0599eb8..987698e 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -97,6 +97,7 @@
 import com.android.launcher3.DropTarget.DragObject;
 import com.android.launcher3.PagedView.PageSwitchListener;
 import com.android.launcher3.allapps.AllAppsContainerView;
+import com.android.launcher3.allapps.DefaultAppSearchController;
 import com.android.launcher3.compat.AppWidgetManagerCompat;
 import com.android.launcher3.compat.LauncherActivityInfoCompat;
 import com.android.launcher3.compat.LauncherAppsCompat;
@@ -1408,7 +1409,7 @@
         if (mLauncherCallbacks != null && mLauncherCallbacks.getAllAppsSearchBarController() != null) {
             mAppsView.setSearchBarController(mLauncherCallbacks.getAllAppsSearchBarController());
         } else {
-            mAppsView.setSearchBarController(mAppsView.newDefaultAppSearchController());
+            mAppsView.setSearchBarController(new DefaultAppSearchController());
         }
 
         // Setup the drag controller (drop targets have to be added in reverse order in priority)