From 82d0835fa53962b149256deeb66509c0cccd5906 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Thu, 28 Jun 2018 15:17:51 -0700
Subject: [PATCH] Fix clipping issue on adaptive icons Bug: 62372639

Verified the one last device, b***line.

Change-Id: I1d97d0cbe0afe76ee21de5964abf639fb4c0fceb
---
 src/com/android/launcher3/graphics/LauncherIcons.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/com/android/launcher3/graphics/LauncherIcons.java b/src/com/android/launcher3/graphics/LauncherIcons.java
index ece6c58407..333fe5907c 100644
--- a/src/com/android/launcher3/graphics/LauncherIcons.java
+++ b/src/com/android/launcher3/graphics/LauncherIcons.java
@@ -337,16 +337,15 @@ public class LauncherIcons implements AutoCloseable {
         final int top = (textureHeight-height) / 2;
 
         mOldBounds.set(icon.getBounds());
-        int offset = 0;
         if (Utilities.ATLEAST_OREO && icon instanceof AdaptiveIconDrawable) {
-            offset = Math.max((int) Math.ceil(BLUR_FACTOR * textureWidth), Math.max(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, offset + size, offset + size);
+            icon.setBounds(offset, offset, size - offset, size - offset);
         } else {
             icon.setBounds(left, top, left+width, top+height);
         }
         mCanvas.save();
-        mCanvas.scale(scale, scale, textureWidth / 2 + offset, textureHeight / 2 + offset);
+        mCanvas.scale(scale, scale, textureWidth / 2, textureHeight / 2);
         icon.draw(mCanvas);
         mCanvas.restore();
         icon.setBounds(mOldBounds);