commit 7c50b31f57e3e3ec1f433d243afe05554dcaf977
author Sunny Goyal <sunnygoyal@google.com> Wed Feb 10 12:26:23 2016 -0800
committer Sunny Goyal <sunnygoyal@google.com> Wed Feb 10 12:27:51 2016 -0800
tree b244d7b5cf1d0c7e753fb3f6751c4108cd87d0a5
parent 323117ca37483c2adcd14b9969e2a36ea57a9d6a
parent 3826bab27ef3e7608aba112bd0f5ce2e7c3eac5b

resolve merge conflicts of 3826bab27e to ub-launcher3-calgary.

Change-Id: I14ff2d67de4ba97628bdf651602724f9f4989173

src/com/android/launcher3/AppInfoDropTargetBar.java

diff --git a/src/com/android/launcher3/AppInfoDropTargetBar.java b/src/com/android/launcher3/AppInfoDropTargetBar.java
index 99a1f41..e06f941 100644
--- a/src/com/android/launcher3/AppInfoDropTargetBar.java
+++ b/src/com/android/launcher3/AppInfoDropTargetBar.java
@@ -47,7 +47,6 @@
         dragController.addDragListener(this);
 
         dragController.addDragListener(mAppInfoDropTarget);
-
         dragController.addDropTarget(mAppInfoDropTarget);
 
         mAppInfoDropTarget.setLauncher(launcher);
@@ -64,7 +63,14 @@
     }
 
     private void animateDropTargetBarToAlpha(float alpha, int duration) {
-        animateViewAlpha(mDropTargetBarAnimator, mDropTargetBar, alpha,duration);
+        resetAnimation(duration);
+        if (duration > 0) {
+            animateAlpha(mDropTargetBar, alpha, DEFAULT_INTERPOLATOR);
+            mCurrentAnimation.start();
+        } else {
+            mDropTargetBar.setAlpha(alpha);
+            AlphaUpdateListener.updateVisibility(mDropTargetBar, mAccessibilityEnabled);
+        }
     }
 
     @Override