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

Commit 463b04cf authored by Sunny Goyal's avatar Sunny Goyal
Browse files

[automerger] Fixing badge bounds incorrectly set when dragging icon am: 5be75795 

Change-Id: Ifd1aa077c9cd732104b4cbcb661c6447efef7209
parents c1c54a9a 5be75795

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

+6 −3
Original line number Diff line number Diff line
@@ -218,6 +218,12 @@ public class DragView extends View { 


                    Rect bounds = new Rect(0, 0, w, h);

                    bounds.inset(blurMargin, blurMargin);

                    // Badge is applied after icon normalization so the bounds for badge should not

                    // be scaled down due to icon normalization.

                    Rect badgeBounds = new Rect(bounds);

                    mBadge = getBadge(info, appState, outObj[0]);

                    mBadge.setBounds(badgeBounds);



                    Utilities.scaleRectAboutCenter(bounds,

                            IconNormalizer.getInstance(mLauncher).getScale(dr, null, null, null));

                    AdaptiveIconDrawable adaptiveIcon = (AdaptiveIconDrawable) dr;
@@ -234,9 +240,6 @@ public class DragView extends View { 
                    mTranslateY = new SpringFloatValue(DragView.this,

                            h * AdaptiveIconDrawable.getExtraInsetFraction());



                    mBadge = getBadge(info, appState, outObj[0]);

                    mBadge.setBounds(bounds);



                    bounds.inset(

                            (int) (-bounds.width() * AdaptiveIconDrawable.getExtraInsetFraction()),

                            (int) (-bounds.height() * AdaptiveIconDrawable.getExtraInsetFraction())