diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-06-20 18:25:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-06-20 18:25:26 +0000 |
| commit | 765996e1e3b281605ec68365dba5de7a556e74a0 (patch) | |
| tree | 723ed54f6ecaee1623a7bf1cff7cbee8b1f7bc4a /src | |
| parent | 7d430c902e645b4fbb6bcf1aceaad0487730fd57 (diff) | |
| parent | 0d84d7de61128e110ae941185eb9ca41ffa2b22f (diff) | |
| download | android_packages_apps_Trebuchet-765996e1e3b281605ec68365dba5de7a556e74a0.tar.gz android_packages_apps_Trebuchet-765996e1e3b281605ec68365dba5de7a556e74a0.tar.bz2 android_packages_apps_Trebuchet-765996e1e3b281605ec68365dba5de7a556e74a0.zip | |
Merge "Apply legacy treatment on all non adaptive icons Bug: 110123894 Bug: 62372639" into ub-launcher3-edmonton-polish
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/IconCache.java | 2 | ||||
| -rw-r--r-- | src/com/android/launcher3/graphics/LauncherIcons.java | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/launcher3/IconCache.java b/src/com/android/launcher3/IconCache.java index 8d79737c5..9dc3129fd 100644 --- a/src/com/android/launcher3/IconCache.java +++ b/src/com/android/launcher3/IconCache.java @@ -801,7 +801,7 @@ public class IconCache { } 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"; diff --git a/src/com/android/launcher3/graphics/LauncherIcons.java b/src/com/android/launcher3/graphics/LauncherIcons.java index 1fa233a0c..09ea1ad41 100644 --- a/src/com/android/launcher3/graphics/LauncherIcons.java +++ b/src/com/android/launcher3/graphics/LauncherIcons.java @@ -248,7 +248,8 @@ public class LauncherIcons implements AutoCloseable { 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) |