Merge pull request #10 from buptfarmer/master

[bugfix] new TransitionDrawable memory leak
patrickfav · Apr 21, 2018 · 0348196 · 0348196
2 parents 50df4ad + af4d284
commit 0348196
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/dali/src/main/java/at/favre/lib/dali/builder/blur/BlurBuilder.java b/dali/src/main/java/at/favre/lib/dali/builder/blur/BlurBuilder.java
@@ -8,6 +8,7 @@
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
+import android.graphics.drawable.LayerDrawable;
 import android.graphics.drawable.TransitionDrawable;
 import android.os.Build;
 import android.os.Handler;
@@ -287,8 +288,14 @@ public void run() {
                             if (data.alphaFadeIn) {
                                 //use what is currently in the imageview to fade
                                 Drawable placeholder;
-                                if (imageView.getDrawable() != null) {
-                                    placeholder = imageView.getDrawable();
+                                Drawable oldDrawable = imageView.getDrawable();
+                                if (oldDrawable != null) {
+                                    if (oldDrawable instanceof LayerDrawable) {
+                                        LayerDrawable oldLayerDrawable = (LayerDrawable) oldDrawable;
+                                        placeholder = oldLayerDrawable.getDrawable(0);
+                                    } else {
+                                        placeholder = imageView.getDrawable();
+                                    }
                                 } else {
                                     placeholder = new ColorDrawable(Color.parseColor("#00FFFFFF"));
                                 }