commit 04c6f8f030a608cca390cf1f69a147c8da7db4a5
author Mac Duy Hai <haim@google.com> Wed Oct 16 07:13:30 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 16 07:13:30 2013 -0700
tree 9e84010396f2b8be1d35a6bcd6882b0aa8d0ee97
parent 4349d2d2fb829e0c9ae54cb687c6b25b849ca06f
parent 09d85a1438531539a768cee3be8c5f5cd840418e

am 09d85a14: am 8246a143: Shortcut show/hideSearchBar with new conditions.

* commit '09d85a1438531539a768cee3be8c5f5cd840418e':
  Shortcut show/hideSearchBar with new conditions.

src/com/android/launcher3/SearchDropTargetBar.java

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