From 4c76bb8b3efe6369581b7105819459b9efd52b79 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Wed, 22 May 2019 07:33:31 -0700
Subject: [PATCH] Fix bug where recycled FloatingIconView stays clipped to
 outline.

Bug: 123900446
Change-Id: I9507dab86cc0da27626d1b48e0f6a236f2b3f219
---
 src/com/android/launcher3/views/FloatingIconView.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/com/android/launcher3/views/FloatingIconView.java b/src/com/android/launcher3/views/FloatingIconView.java
index a9e8f1733c..3d5877a597 100644
--- a/src/com/android/launcher3/views/FloatingIconView.java
+++ b/src/com/android/launcher3/views/FloatingIconView.java
@@ -481,6 +481,7 @@ public class FloatingIconView extends View implements
                 setClipToOutline(true);
             } else {
                 setBackground(finalDrawable);
+                setClipToOutline(false);
             }
 
             if (!loadIconSignal.isCanceled()) {
@@ -751,5 +752,6 @@ public class FloatingIconView extends View implements
         mFgTransX = 0;
         mFgSpringY.cancel();
         mBadge = null;
+        sTmpObjArray[0] = null;
     }
 }