commit 0d84d7de61128e110ae941185eb9ca41ffa2b22f
author Hyunyoung Song <hyunyoungs@google.com> Fri Jun 15 14:45:04 2018 -0700
committer Hyunyoung Song <hyunyoungs@google.com> Wed Jun 20 11:01:52 2018 -0700
tree 1d485d93b70d56b3c18b89ebc717a222ff3d607c
parent 6e680f9bf6e6b6406194502d2cf44a235c4bdffc

Apply legacy treatment on all non adaptive icons
Bug: 110123894
Bug: 62372639

Change-Id: I3bcaa3b9886942b4f1d45aaeebc8b8022e1319f8

src/com/android/launcher3/IconCache.java

diff --git a/src/com/android/launcher3/IconCache.java b/src/com/android/launcher3/IconCache.java
index 8d79737..9dc3129 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 = 22;
+        private final static int RELEASE_VERSION = 23;
 
         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 89ba72a..3cf9c2f 100644
--- a/src/com/android/launcher3/graphics/LauncherIcons.java
+++ b/src/com/android/launcher3/graphics/LauncherIcons.java
@@ -241,7 +241,8 @@
     private Drawable normalizeAndWrapToAdaptiveIcon(Drawable icon, int iconAppTargetSdk,
             RectF outIconBounds, float[] outScale) {
         float scale = 1f;
-        if (Utilities.ATLEAST_OREO && iconAppTargetSdk >= Build.VERSION_CODES.O) {
+        if ((Utilities.ATLEAST_OREO && iconAppTargetSdk >= Build.VERSION_CODES.O) ||
+                Utilities.ATLEAST_P) {
             boolean[] outShape = new boolean[1];
             if (mWrapperIcon == null) {
                 mWrapperIcon = mContext.getDrawable(R.drawable.adaptive_icon_drawable_wrapper)