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
CyanogenMod · May 13, 2015 · faff75b · faff75b
1 parent 8df1f02
commit faff75b
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/src/com/android/launcher3/SearchDropTargetBar.java b/src/com/android/launcher3/SearchDropTargetBar.java
@@ -97,13 +97,6 @@ private void setupAnimation(ObjectAnimator anim, final View v) {
         anim.setInterpolator(sAccelerateInterpolator);
         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 void onDragEnd() {
             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();
             }