diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-06-06 21:13:13 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-06-06 21:13:16 +0000 |
commit | 88082394eb0f93768843a9884493cfd859563329 (patch) | |
tree | dd60d54df681165ae3114fd714ba22059b52a674 | |
parent | ce338fca124ecc3f764be23939c9c4859a66e5c0 (diff) | |
parent | 9279496e542e6dee3355e19e4a696e800873ee96 (diff) | |
download | android_packages_apps_Trebuchet-88082394eb0f93768843a9884493cfd859563329.tar.gz android_packages_apps_Trebuchet-88082394eb0f93768843a9884493cfd859563329.tar.bz2 android_packages_apps_Trebuchet-88082394eb0f93768843a9884493cfd859563329.zip |
Merge "Prevent clipping on the top and left side on AdaptiveIconDrawables b/62372639" into ub-launcher3-dorval
-rw-r--r-- | src/com/android/launcher3/graphics/LauncherIcons.java | 5 | ||||
-rw-r--r-- | src/com/android/launcher3/graphics/ShadowGenerator.java | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/launcher3/graphics/LauncherIcons.java b/src/com/android/launcher3/graphics/LauncherIcons.java index 53521f22d..19e570247 100644 --- a/src/com/android/launcher3/graphics/LauncherIcons.java +++ b/src/com/android/launcher3/graphics/LauncherIcons.java @@ -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); } diff --git a/src/com/android/launcher3/graphics/ShadowGenerator.java b/src/com/android/launcher3/graphics/ShadowGenerator.java index 469fe34e9..5d8cca8d2 100644 --- a/src/com/android/launcher3/graphics/ShadowGenerator.java +++ b/src/com/android/launcher3/graphics/ShadowGenerator.java @@ -35,7 +35,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; |