1 files changed, 6 insertions, 22 deletions
diff --git a/java/com/android/dialer/app/widget/ActionBarController.java b/java/com/android/dialer/app/widget/ActionBarController.java
index c1b4cc2b4..3daa0e2d4 100644
--- a/java/com/android/dialer/app/widget/ActionBarController.java
+++ b/java/com/android/dialer/app/widget/ActionBarController.java
@@ -49,18 +49,6 @@ public class ActionBarController {
         }
       };
 
-  private final AnimationCallback mFadeInCallback =
-      new AnimationCallback() {
-        @Override
-        public void onAnimationEnd() {
-          slideActionBar(false /* slideUp */, false /* animate */);
-        }
-
-        @Override
-        public void onAnimationCancel() {
-          slideActionBar(false /* slideUp */, false /* animate */);
-        }
-      };
   private ValueAnimator mAnimator;
 
   public ActionBarController(ActivityUi activityUi, SearchEditTextLayout searchBox) {
@@ -112,17 +100,13 @@ public class ActionBarController {
         mSearchBox.isFadedOut(),
         mSearchBox.isExpanded());
     if (mActivityUi.isInSearchUi()) {
-      if (mActivityUi.hasSearchQuery()) {
-        if (mSearchBox.isFadedOut()) {
-          mSearchBox.setVisible(true);
-        }
-        if (!mSearchBox.isExpanded()) {
-          mSearchBox.expand(false /* animate */, false /* requestFocus */);
-        }
-        slideActionBar(false /* slideUp */, true /* animate */);
-      } else {
-        mSearchBox.fadeIn(mFadeInCallback);
+      if (mSearchBox.isFadedOut()) {
+        mSearchBox.setVisible(true);
+      }
+      if (!mSearchBox.isExpanded()) {
+        mSearchBox.expand(false /* animate */, false /* requestFocus */);
       }
+      slideActionBar(false /* slideUp */, true /* animate */);
     }
   }