summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2018-05-29 17:38:28 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-05-29 17:38:28 +0000
commit03aaced25213dd2a8dc03a44213f821fea53236d (patch)
tree5ad344b1c04d053660587129be431e9d0ec8c21a
parent5c17a390d235fdafb51cfe4a8d508edc5f7a5a67 (diff)
parent49df554dc22521b2b4cb56f879846ccce81f4e0d (diff)
downloadandroid_packages_apps_Trebuchet-03aaced25213dd2a8dc03a44213f821fea53236d.tar.gz
android_packages_apps_Trebuchet-03aaced25213dd2a8dc03a44213f821fea53236d.tar.bz2
android_packages_apps_Trebuchet-03aaced25213dd2a8dc03a44213f821fea53236d.zip
Merge "Fix clipping of adaptive icons Bug:62372639" into ub-launcher3-edmonton
-rw-r--r--src/com/android/launcher3/graphics/LauncherIcons.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher3/graphics/LauncherIcons.java b/src/com/android/launcher3/graphics/LauncherIcons.java
index f020d2d7c..89ba72abf 100644
--- a/src/com/android/launcher3/graphics/LauncherIcons.java
+++ b/src/com/android/launcher3/graphics/LauncherIcons.java
@@ -330,9 +330,9 @@ public class LauncherIcons implements AutoCloseable {
mOldBounds.set(icon.getBounds());
if (Utilities.ATLEAST_OREO && icon instanceof AdaptiveIconDrawable) {
- int offset = Math.max((int)(BLUR_FACTOR * textureWidth), Math.min(left, top));
+ int offset = Math.max((int) Math.ceil(BLUR_FACTOR * textureWidth), Math.max(left, top));
int size = Math.max(width, height);
- icon.setBounds(offset, offset, size, size);
+ icon.setBounds(offset, offset, offset + size, offset + size);
} else {
icon.setBounds(left, top, left+width, top+height);
}