diff options
| author | Mac Duy Hai <haim@google.com> | 2013-10-16 07:09:59 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-16 07:09:59 -0700 |
| commit | 09d85a1438531539a768cee3be8c5f5cd840418e (patch) | |
| tree | 9e84010396f2b8be1d35a6bcd6882b0aa8d0ee97 | |
| parent | 28f852ab678d9750879b6d3549bf5da176cf1225 (diff) | |
| parent | 8246a1434c12b607743222c22285b72c9a96497b (diff) | |
| download | android_packages_apps_Trebuchet-09d85a1438531539a768cee3be8c5f5cd840418e.tar.gz android_packages_apps_Trebuchet-09d85a1438531539a768cee3be8c5f5cd840418e.tar.bz2 android_packages_apps_Trebuchet-09d85a1438531539a768cee3be8c5f5cd840418e.zip | |
am 8246a143: Shortcut show/hideSearchBar with new conditions.
* commit '8246a1434c12b607743222c22285b72c9a96497b':
Shortcut show/hideSearchBar with new conditions.
| -rw-r--r-- | src/com/android/launcher3/SearchDropTargetBar.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/launcher3/SearchDropTargetBar.java b/src/com/android/launcher3/SearchDropTargetBar.java index 7a6147922..435dbda1d 100644 --- a/src/com/android/launcher3/SearchDropTargetBar.java +++ b/src/com/android/launcher3/SearchDropTargetBar.java @@ -138,6 +138,8 @@ public class SearchDropTargetBar extends FrameLayout implements DragController.D * 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 @@ public class SearchDropTargetBar extends FrameLayout implements DragController.D mIsSearchBarHidden = false; } public void hideSearchBar(boolean animated) { + boolean needToCancelOngoingAnimation = mQSBSearchBarAnim.isRunning() && !animated; + if (mIsSearchBarHidden && !needToCancelOngoingAnimation) return; if (animated) { prepareStartAnimation(mQSBSearchBar); mQSBSearchBarAnim.start(); |