commit 8e8c46069c3f014694b59bbeb49105e085c5e59c
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Mar 27 22:21:41 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 27 22:21:41 2019 +0000
tree e7de40886d94138419e2343400243c1b6b84ef28
parent 38b2748eb2254adf902966c6b267ed55ca3cdf6b
parent 2ed8936da143de7f99d9bbf212df37ee3361c1ca

Merge "Fix translationX that should be translationY" into ub-launcher3-master

Android.mk

diff --git a/Android.mk b/Android.mk
index b3b1c82..06ee66f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -33,10 +33,7 @@
 LOCAL_AAPT2_ONLY := true
 LOCAL_MODULE_TAGS := optional
 
-ifneq (,$(wildcard frameworks/base))
-else
-    LOCAL_STATIC_JAVA_LIBRARIES:= libPluginCore
-endif
+LOCAL_STATIC_JAVA_LIBRARIES:= libPluginCore
 
 LOCAL_SRC_FILES := \
     $(call all-java-files-under, src_plugins)

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;