Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da342e09 authored by Tony Wickham's avatar Tony Wickham Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'am-62871b14-7da8-4b31-b420-c5c87d1477d2' into ub-launcher3-master 

* changes:
  [automerger] Handle null background or foreground when dragging adaptive icons am: 746c6c36
  Handle null background or foreground when dragging adaptive icons
parents 2e70cb08 b46aa4a3

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

+6 −0
Original line number Diff line number Diff line
@@ -242,8 +242,14 @@ public class DragView extends View { 
                            (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() {