| Revision | 88082394eb0f93768843a9884493cfd859563329 (tree) |
|---|---|
| Time | 2017-06-07 06:13:16 |
| Author | TreeHugger Robot <treehugger-gerrit@goog...> |
| Commiter | Android (Google) Code Review |
Merge "Prevent clipping on the top and left side on AdaptiveIconDrawables b/62372639" into ub-launcher3-dorval
src/com/android/launcher3/graphics/LauncherIcons.java (diff) src/com/android/launcher3/graphics/ShadowGenerator.java (diff)| @@ -266,9 +266,10 @@ public class LauncherIcons { | ||
| 266 | 266 | |
| 267 | 267 | sOldBounds.set(icon.getBounds()); |
| 268 | 268 | if (Utilities.isAtLeastO() && icon instanceof AdaptiveIconDrawable) { |
| 269 | - int offset = Math.min(left, top); | |
| 269 | + int offset = Math.max((int)(ShadowGenerator.BLUR_FACTOR * iconBitmapSize), | |
| 270 | + Math.min(left, top)); | |
| 270 | 271 | int size = Math.max(width, height); |
| 271 | - icon.setBounds(offset, offset, offset + size, offset + size); | |
| 272 | + icon.setBounds(offset, offset, size, size); | |
| 272 | 273 | } else { |
| 273 | 274 | icon.setBounds(left, top, left+width, top+height); |
| 274 | 275 | } |
| @@ -35,7 +35,7 @@ public class ShadowGenerator { | ||
| 35 | 35 | |
| 36 | 36 | // Percent of actual icon size |
| 37 | 37 | private static final float HALF_DISTANCE = 0.5f; |
| 38 | - private static final float BLUR_FACTOR = 0.5f/48; | |
| 38 | + public static final float BLUR_FACTOR = 0.5f/48; | |
| 39 | 39 | |
| 40 | 40 | // Percent of actual icon size |
| 41 | 41 | private static final float KEY_SHADOW_DISTANCE = 1f/48; |
Android-x86
Fork