commit 00e610f93c731d71c8a8424e52a723ef43236084
author Sunny Goyal <sunnygoyal@google.com> Wed Jun 21 23:34:13 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jun 21 23:34:13 2017 +0000
tree e9a84c4d137c1ba9675240e4e1135399520df129
parent 9ef87227c6b8a5453b33d106b1e59db9fc17abc0
parent 318f567a849223284eecec761c23b41a3fd2e568

Prevent recursive draw-invalidate cycle when drawing folder
am: 318f567a84

Change-Id: If30399d1acaff09239d9a7a6d0bf76891bf43144

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();
     }