Merge "Prevent clipping on the top and left side on AdaptiveIconDrawables b/62372639" into ub-launcher3-dorval

am: 88082394eb

Change-Id: I7148678d490c55e9a10e672cba839ef8aef9d00a
This commit is contained in:
Hyunyoung Song
2017-06-06 21:17:52 +00:00
committed by android-build-merger
2 changed files with 4 additions and 3 deletions
@@ -266,9 +266,10 @@ public class LauncherIcons {
sOldBounds.set(icon.getBounds());
if (Utilities.isAtLeastO() && icon instanceof AdaptiveIconDrawable) {
int offset = Math.min(left, top);
int offset = Math.max((int)(ShadowGenerator.BLUR_FACTOR * iconBitmapSize),
Math.min(left, top));
int size = Math.max(width, height);
icon.setBounds(offset, offset, offset + size, offset + size);
icon.setBounds(offset, offset, size, size);
} else {
icon.setBounds(left, top, left+width, top+height);
}
@@ -37,7 +37,7 @@ public class ShadowGenerator {
// Percent of actual icon size
private static final float HALF_DISTANCE = 0.5f;
private static final float BLUR_FACTOR = 0.5f/48;
public static final float BLUR_FACTOR = 0.5f/48;
// Percent of actual icon size
private static final float KEY_SHADOW_DISTANCE = 1f/48;