commit 89c467d2899e9a89d5c269f66d03f65e47d35eaa
author Tony Wickham <twickham@google.com> Wed Jul 26 22:07:11 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 26 22:07:11 2017 +0000
tree 799f289f314602b2430d0fd6f9d914d5878e9ec5
parent 9fac09d85267f631702e239de3576f24c31e120c
parent 746c6c36b656115076318c353418e3ecae303bbc

Merge "Handle null background or foreground when dragging adaptive icons" into ub-launcher3-dorval-polish2

src/com/android/launcher3/dragndrop/DragView.java

diff --git a/src/com/android/launcher3/dragndrop/DragView.java b/src/com/android/launcher3/dragndrop/DragView.java
index 4985413..b6e38bb 100644
--- a/src/com/android/launcher3/dragndrop/DragView.java
+++ b/src/com/android/launcher3/dragndrop/DragView.java
@@ -242,8 +242,14 @@
                             (int) (-bounds.height() * AdaptiveIconDrawable.getExtraInsetFraction())
                     );
                     mBgSpringDrawable = adaptiveIcon.getBackground();
+                    if (mBgSpringDrawable == null) {
+                        mBgSpringDrawable = new ColorDrawable(Color.TRANSPARENT);
+                    }
                     mBgSpringDrawable.setBounds(bounds);
                     mFgSpringDrawable = adaptiveIcon.getForeground();
+                    if (mFgSpringDrawable == null) {
+                        mFgSpringDrawable = new ColorDrawable(Color.TRANSPARENT);
+                    }
                     mFgSpringDrawable.setBounds(bounds);
 
                     new Handler(Looper.getMainLooper()).post(new Runnable() {