commit d3f8d667a5c63e62bb03eb6183f166d37076daf1
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jun 29 00:54:42 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 29 00:54:42 2018 +0000
tree c970ee2fd31ac28c2a7ed5c7a92dbff1c0ca3a15
parent 778112acf7e86eba0844324c90347a60a394bd23
parent 1e819d5ae593cc1933f854f9eb572bc63b3f3960

Merge "Import translations. DO NOT MERGE" into ub-launcher3-master

src/com/android/launcher3/IconCache.java

diff --git a/src/com/android/launcher3/IconCache.java b/src/com/android/launcher3/IconCache.java
index 9dc3129..c5ca183 100644
--- a/src/com/android/launcher3/IconCache.java
+++ b/src/com/android/launcher3/IconCache.java
@@ -801,7 +801,7 @@
     }
 
     private static final class IconDB extends SQLiteCacheHelper {
-        private final static int RELEASE_VERSION = 23;
+        private final static int RELEASE_VERSION = 24;
 
         private final static String TABLE_NAME = "icons";
         private final static String COLUMN_ROWID = "rowid";

src/com/android/launcher3/graphics/LauncherIcons.java

diff --git a/src/com/android/launcher3/graphics/LauncherIcons.java b/src/com/android/launcher3/graphics/LauncherIcons.java
index 09ea1ad..333fe59 100644
--- a/src/com/android/launcher3/graphics/LauncherIcons.java
+++ b/src/com/android/launcher3/graphics/LauncherIcons.java
@@ -340,7 +340,7 @@
         if (Utilities.ATLEAST_OREO && icon instanceof AdaptiveIconDrawable) {
             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);
         }