PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* changes:
  [automerger] Handle null background or foreground when dragging adaptive icons am: 746c6c36b6
  Handle null background or foreground when dragging adaptive icons
This commit is contained in:
Tony Wickham
2017-07-26 22:07:11 +00:00
committed by Android (Google) Code Review
parent 2e70cb081f b46aa4a39f
commit da342e092a
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/dragndrop/DragView.java
+6
View File
@@ -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() {