diff options
| author | Tony Wickham <twickham@google.com> | 2017-07-26 22:07:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-07-26 22:07:11 +0000 |
| commit | 89c467d2899e9a89d5c269f66d03f65e47d35eaa (patch) | |
| tree | 799f289f314602b2430d0fd6f9d914d5878e9ec5 | |
| parent | 9fac09d85267f631702e239de3576f24c31e120c (diff) | |
| parent | 746c6c36b656115076318c353418e3ecae303bbc (diff) | |
| download | android_packages_apps_Trebuchet-89c467d2899e9a89d5c269f66d03f65e47d35eaa.tar.gz android_packages_apps_Trebuchet-89c467d2899e9a89d5c269f66d03f65e47d35eaa.tar.bz2 android_packages_apps_Trebuchet-89c467d2899e9a89d5c269f66d03f65e47d35eaa.zip | |
Merge "Handle null background or foreground when dragging adaptive icons" into ub-launcher3-dorval-polish2
| -rw-r--r-- | src/com/android/launcher3/dragndrop/DragView.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/launcher3/dragndrop/DragView.java b/src/com/android/launcher3/dragndrop/DragView.java index 49854131f..b6e38bb15 100644 --- a/src/com/android/launcher3/dragndrop/DragView.java +++ b/src/com/android/launcher3/dragndrop/DragView.java @@ -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() { |