commit ae775276ac4c4ae1a89b388a3e422d93d5487d7d
author Tony Wickham <twickham@google.com> Thu Mar 28 21:51:06 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 28 21:51:06 2019 +0000
tree 91a37ee863ee3215a8c71f4c0dfc8e1018266f27
parent 7553695e1ea7db1a6e611ce7d5fd25b948c74457
parent e4c2e2b86cf74013efc52f81ac8b1b6d85822646

Merge "Add QuickSwitchTouchController on home" 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 d1e2c88..49ec292 100644
--- a/src/com/android/launcher3/views/FloatingIconView.java
+++ b/src/com/android/launcher3/views/FloatingIconView.java
@@ -427,7 +427,9 @@
                         public void onAnimationEnd(Animator animation) {
                             folderIcon.setBackgroundVisible(true);
                             folderIcon.animateBgShadowAndStroke();
-                            folderIcon.animateDotScale(0, 1f);
+                            if (folderIcon.hasDot()) {
+                                folderIcon.animateDotScale(0, 1f);
+                            }
                         }
                     });
                 } else {