diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2017-08-07 00:00:37 -0700 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2017-08-07 10:42:22 -0700 |
| commit | 5be75795986da5229ec07ad8eec6a8cf0f7a19a3 (patch) | |
| tree | cf489ddd5aa9d1c54583e76699b163c2c4b98242 | |
| parent | f2b83d0e84eccd5e2dc7257f17f5747c867facb3 (diff) | |
| download | android_packages_apps_Trebuchet-5be75795986da5229ec07ad8eec6a8cf0f7a19a3.tar.gz android_packages_apps_Trebuchet-5be75795986da5229ec07ad8eec6a8cf0f7a19a3.tar.bz2 android_packages_apps_Trebuchet-5be75795986da5229ec07ad8eec6a8cf0f7a19a3.zip | |
Fixing badge bounds incorrectly set when dragging icon
Bug: 64427027
Change-Id: If57bdcab703b2cc30e8ca0c0fba0dd599792bd00
| -rw-r--r-- | src/com/android/launcher3/dragndrop/DragView.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/com/android/launcher3/dragndrop/DragView.java b/src/com/android/launcher3/dragndrop/DragView.java index b6e38bb15..e81e2a386 100644 --- a/src/com/android/launcher3/dragndrop/DragView.java +++ b/src/com/android/launcher3/dragndrop/DragView.java @@ -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()) |