commit 6f455b583f6c37eafcb357b0727dbb0133db21ad
author Jon Miranda <jonmiranda@google.com> Wed Mar 27 08:27:16 2019 -0700
committer Jon Miranda <jonmiranda@google.com> Wed Mar 27 09:42:50 2019 -0700
tree 39652b3ac8da1e52abdd2226506e87d5f25bfe90
parent 4397d8d5ea53e4b31d6e445ec048bc21ad87a560

Fix sizing of FloatingIconView so that it matches the workspace.

* Added a cross fade at the end for text and shadows.
* Animate in FolderIcon bg/dot/text after swapping.

Bug: 129297366
Change-Id: Ieeb5d7b8fb389a2f7ee263d38b3021ffdefefd93

src/com/android/launcher3/BubbleTextView.java

diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index d75006e..4dd2e0a 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -480,7 +480,8 @@
      */
     public ObjectAnimator createTextAlphaAnimator(boolean fadeIn) {
         float toAlpha = shouldTextBeVisible() && fadeIn ? 1 : 0;
-        return ObjectAnimator.ofFloat(this, TEXT_ALPHA_PROPERTY, toAlpha);
+        float fromAlpha = toAlpha == 1 ? 0 : 1f;
+        return ObjectAnimator.ofFloat(this, TEXT_ALPHA_PROPERTY, fromAlpha, toAlpha);
     }
 
     @Override