Apply legacy treatment on all non adaptive icons

Bug: 110123894
Bug: 62372639

Change-Id: I3bcaa3b9886942b4f1d45aaeebc8b8022e1319f8
This commit is contained in:
Hyunyoung Song
2018-06-15 14:45:04 -07:00
parent 6e680f9bf6
commit 0d84d7de61
2 changed files with 3 additions and 2 deletions

View File

@@ -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";

View File

@@ -241,7 +241,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)