commit 2348796e36621bd54d24048a54d156e3e147dfdf
author Sunny Goyal <sunnygoyal@google.com> Tue Jul 04 20:32:56 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 04 20:32:56 2017 +0000
tree 0f379c979aeb0d338991757e43da1e9bf488c2be
parent 94e9d5372892f8b977983691dd413301ee153c71
parent bc1d0774aa3696b019ca5072d6e9de1dec934c33

Merge "Fixing clip mask not getting initialized properly." into ub-launcher3-dorval-polish

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 022b3b8..09cfc1e 100644
--- a/src/com/android/launcher3/dragndrop/DragView.java
+++ b/src/com/android/launcher3/dragndrop/DragView.java
@@ -222,11 +222,11 @@
                     int w = mBitmap.getWidth();
                     int h = mBitmap.getHeight();
                     AdaptiveIconDrawable adaptiveIcon = (AdaptiveIconDrawable) dr;
-                    adaptiveIcon.setBounds(0, 0, w, h);
                     float blurSizeOutline = mLauncher.getResources()
                             .getDimension(R.dimen.blur_size_medium_outline);
                     float normalizationScale = IconNormalizer.getInstance(mLauncher)
                             .getScale(adaptiveIcon, null, null, null) * ((w - blurSizeOutline) / w);
+                    adaptiveIcon.setBounds(0, 0, w, h);
 
                     final Path mask = getMaskPath(adaptiveIcon, normalizationScale);
                     mFgImageView = setupImageView(adaptiveIcon.getForeground(), normalizationScale);