commit 552960364fe401e8b4f77fbe5a3c01068ae53633
author Mac Duy Hai <haim@google.com> Mon Oct 14 06:37:52 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Oct 14 06:37:52 2013 -0700
tree 1987b43aa43a0a1e8fd61bbce76c9fbb3ff59470
parent 71aa8226c7f8c36756bb59cbef5883506e3c52be
parent f55ea2f8d3633539f2b5c38d1765bf8c205440a5

am f55ea2f8: am decbaa69: Do not shortcut show/hideSearchbar.

* commit 'f55ea2f8d3633539f2b5c38d1765bf8c205440a5':
  Do not shortcut show/hideSearchbar.

src/com/android/launcher3/SearchDropTargetBar.java

diff --git a/src/com/android/launcher3/SearchDropTargetBar.java b/src/com/android/launcher3/SearchDropTargetBar.java
index e681aa1..7a61479 100644
--- a/src/com/android/launcher3/SearchDropTargetBar.java
+++ b/src/com/android/launcher3/SearchDropTargetBar.java
@@ -138,7 +138,6 @@
      * Shows and hides the search bar.
      */
     public void showSearchBar(boolean animated) {
-        if (!mIsSearchBarHidden) return;
         if (animated) {
             prepareStartAnimation(mQSBSearchBar);
             mQSBSearchBarAnim.reverse();
@@ -153,7 +152,6 @@
         mIsSearchBarHidden = false;
     }
     public void hideSearchBar(boolean animated) {
-        if (mIsSearchBarHidden) return;
         if (animated) {
             prepareStartAnimation(mQSBSearchBar);
             mQSBSearchBarAnim.start();