From b0df1b0e1ac865818942851b6a0d1fdca4843834 Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Wed, 18 Mar 2015 22:21:40 -0700
Subject: [PATCH] Make sure we set the QSB bar on the SearchDropTargetBar

Change-Id: If106bae15b3d628d6385711bcb8059acd17d6147
---
 src/com/android/launcher3/Launcher.java | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index bf03f745be..d64296e794 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1441,10 +1441,7 @@ public class Launcher extends Activity
         dragController.addDropTarget(mWorkspace);
         if (mSearchDropTargetBar != null) {
             mSearchDropTargetBar.setup(this, dragController);
-            if (getOrCreateQsbBar() == null) {
-                // Explicitly set it to null during initialization.
-                mSearchDropTargetBar.setQsbSearchBar(null);
-            }
+            mSearchDropTargetBar.setQsbSearchBar(getOrCreateQsbBar());
         }
 
         if (getResources().getBoolean(R.bool.debug_memory_enabled)) {
@@ -4089,7 +4086,7 @@ public class Launcher extends Activity
             mSearchDropTargetBar.removeView(mQsb);
             mQsb = null;
         }
-        getOrCreateQsbBar();
+        mSearchDropTargetBar.setQsbSearchBar(getOrCreateQsbBar());
     }
 
     /**