commit 38b2748eb2254adf902966c6b267ed55ca3cdf6b
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Mar 27 22:13:09 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 27 22:13:09 2019 +0000
tree c059d11101bb15bcfbdef67ad82a144c4d605bee
parent 83fb1b0ed8e82d98d960843ab21e65b09b5d21b9
parent cbf82cc06275d582d9c2dbe636d12d00cceb9bb3

Merge "Reconcile difference between master and ub-launcher3-master" into ub-launcher3-master

src/com/android/launcher3/views/FloatingIconView.java

diff --git a/src/com/android/launcher3/views/FloatingIconView.java b/src/com/android/launcher3/views/FloatingIconView.java
index a4f89a7..d1e2c88 100644
--- a/src/com/android/launcher3/views/FloatingIconView.java
+++ b/src/com/android/launcher3/views/FloatingIconView.java
@@ -434,6 +434,8 @@
                     fade.play(ObjectAnimator.ofFloat(originalView, ALPHA, 0f, 1f));
                 }
                 fade.start();
+                // TODO: Do not run fade animation until we fix b/129421279.
+                fade.end();
             };
         }
         return view;