commit b46aa4a39f8b4da0fbd941ed0c26b046da7f19af
author Tony Wickham <twickham@google.com> Wed Jul 26 21:36:04 2017 +0000
committer Tony Wickham <twickham@google.com> Wed Jul 26 21:36:04 2017 +0000
tree 2b17e23770276396893afd0f785049ebb8fc8d4a
parent 8a1702ce28ecaf600cb789292c42f6ba6bbc113f
parent 746c6c36b656115076318c353418e3ecae303bbc

[automerger] Handle null background or foreground when dragging adaptive icons am: 746c6c36b6

Change-Id: I3e254a7109e114072cf003ef5c2a4798604d1d1f

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() {