commit 318f567a849223284eecec761c23b41a3fd2e568
author Sunny Goyal <sunnygoyal@google.com> Wed Jun 21 16:10:45 2017 -0700
committer Sunny Goyal <sunnygoyal@google.com> Wed Jun 21 16:11:17 2017 -0700
tree b36011e968b23c81493cb136814693d9679048b1
parent a2fde430b53c78255ea2cc87308897a06afb6723

Prevent recursive draw-invalidate cycle when drawing folder

Change-Id: I4d3e680ee0cd1af9da997ac92c505ca38ee4e810

src/com/android/launcher3/folder/FolderIcon.java

diff --git a/src/com/android/launcher3/folder/FolderIcon.java b/src/com/android/launcher3/folder/FolderIcon.java
index b6f05f3..48d8e10 100644
--- a/src/com/android/launcher3/folder/FolderIcon.java
+++ b/src/com/android/launcher3/folder/FolderIcon.java
@@ -510,6 +510,10 @@
         Drawable d = params.drawable;
 
         if (d != null) {
+            // Remove the callback to prevent invalidate as a result of property changes
+            Drawable.Callback cb = d.getCallback();
+            d.setCallback(null);
+
             mTempBounds.set(d.getBounds());
             d.setBounds(0, 0, mIntrinsicIconSize, mIntrinsicIconSize);
             boolean isPreloadIcon = d instanceof PreloadIconDrawable;
@@ -523,6 +527,7 @@
                 d.clearColorFilter();
             }
             d.setBounds(mTempBounds);
+            d.setCallback(cb);
         }
         canvas.restore();
     }