commit 0609c15a600492edadd54c5a504d77050753ce20
author Winson <winsonc@google.com> Thu Aug 20 22:34:10 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Aug 20 22:34:10 2015 +0000
tree 0d1d03286e8bceb48b5da319f94e4fef155de561
parent 2e7e5776d26cb29d4b23879c699e1b1c510a48d4
parent 81c5f7e39727085e1a8915cc36e9cbf2bb085890

am 81c5f7e3: Fixing issue with search bar not being visible.

* commit '81c5f7e39727085e1a8915cc36e9cbf2bb085890':
  Fixing issue with search bar not being visible.

src/com/android/launcher3/SearchDropTargetBar.java

diff --git a/src/com/android/launcher3/SearchDropTargetBar.java b/src/com/android/launcher3/SearchDropTargetBar.java
index 4600de0..fdcad82 100644
--- a/src/com/android/launcher3/SearchDropTargetBar.java
+++ b/src/com/android/launcher3/SearchDropTargetBar.java
@@ -187,7 +187,12 @@
      */
     private void animateViewAlpha(LauncherViewPropertyAnimator animator, View v, float alpha,
             int duration) {
-        if (v != null && Float.compare(v.getAlpha(), alpha) != 0) {
+        if (v == null) {
+            return;
+        }
+
+        animator.cancel();
+        if (Float.compare(v.getAlpha(), alpha) != 0) {
             if (duration > 0) {
                 animator.alpha(alpha).withLayer().setDuration(duration).start();
             } else {