Trebuchet: fix behavior when ShowSearchBar feature is toggled off

This bug was introduced with the New Folder UI changes

Repro:
 - Turn off Show Search Bar
 - Open App Drawer
 - Close App Drawer
 - Observe: "small" search bar shows up at the top of the screen

Change-Id: I18e59acff3197ea908473c89ff3ade8eaf9bed28

1 files changed, 4 insertions, 7 deletions

diff --git a/src/com/android/launcher3/SearchDropTargetBar.java b/src/com/android/launcher3/SearchDropTargetBar.java
index e2f4b386c..611948d29 100644
--- a/src/com/android/launcher3/SearchDropTargetBar.java
+++ b/src/com/android/launcher3/SearchDropTargetBar.java
@@ -98,13 +98,6 @@ public class SearchDropTargetBar extends FrameLayout implements DragController.D
         anim.setDuration(sTransitionInDuration);
         anim.addListener(new AnimatorListenerAdapter() {
             @Override
-            public void onAnimationStart(Animator animation) {
-                if (v.getVisibility() != View.VISIBLE) {
-                    v.setVisibility(View.VISIBLE);
-                }
-            }
-
-            @Override
             public void onAnimationEnd(Animator animation) {
                 v.setLayerType(View.LAYER_TYPE_NONE, null);
             }
@@ -227,6 +220,10 @@ public class SearchDropTargetBar extends FrameLayout implements DragController.D
             prepareStartAnimation(mDropTargetBar);
             mDropTargetBarAnim.reverse();
             if (!isAnyFolderOpen() && (!mIsSearchBarHidden || mQSBSearchBar.getAlpha() < 1f)) {
+                if (mLauncher != null && mLauncher.shouldShowSearchBar()
+                        && mQSBSearchBar.getVisibility() != View.VISIBLE) {
+                    mQSBSearchBar.setVisibility(View.VISIBLE);
+                }
                 prepareStartAnimation(mQSBSearchBar);
                 mQSBSearchBarAnim.reverse();
             }