commit 593d8a471109529c5ea3212ec3a56fdc17088d38
author Jon Miranda <jonmiranda@google.com> Wed May 22 15:06:02 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed May 22 15:06:02 2019 -0700
tree cb1fdb6510722bb1e6f90174610594ca66522987
parent b486c131fecd5a58605ecb862d815115d376ebd6
parent 8fcab4b88ccb2793a6a64074079419d24a019a29

Fix bug where recycled FloatingIconView stays clipped to outline. am: 4c76bb8b3e
am: 8fcab4b88c

Change-Id: I9a6d45b75484dbe94cf68fde42fbf2756d33787f

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 a9e8f17..3d5877a 100644
--- a/src/com/android/launcher3/views/FloatingIconView.java
+++ b/src/com/android/launcher3/views/FloatingIconView.java
@@ -481,6 +481,7 @@
                 setClipToOutline(true);
             } else {
                 setBackground(finalDrawable);
+                setClipToOutline(false);
             }
 
             if (!loadIconSignal.isCanceled()) {
@@ -751,5 +752,6 @@
         mFgTransX = 0;
         mFgSpringY.cancel();
         mBadge = null;
+        sTmpObjArray[0] = null;
     }
 }