diff --git a/iconloaderlib/src/com/android/uiuios/icons/BaseIconFactory.java b/iconloaderlib/src/com/android/uiuios/icons/BaseIconFactory.java index b91c162..54a735f 100644 --- a/iconloaderlib/src/com/android/uiuios/icons/BaseIconFactory.java +++ b/iconloaderlib/src/com/android/uiuios/icons/BaseIconFactory.java @@ -208,27 +208,27 @@ public class BaseIconFactory implements AutoCloseable { RectF outIconBounds, float[] outScale) { float scale = 1f; - if (shrinkNonAdaptiveIcons && ATLEAST_OREO) { - if (mWrapperIcon == null) { - mWrapperIcon = mContext.getDrawable(R.drawable.adaptive_icon_drawable_wrapper) - .mutate(); - } - AdaptiveIconDrawable dr = (AdaptiveIconDrawable) mWrapperIcon; - dr.setBounds(0, 0, 1, 1); - boolean[] outShape = new boolean[1]; - scale = getNormalizer().getScale(icon, outIconBounds, dr.getIconMask(), outShape); - if (!(icon instanceof AdaptiveIconDrawable) && !outShape[0]) { - FixedScaleDrawable fsd = ((FixedScaleDrawable) dr.getForeground()); - fsd.setDrawable(icon); - fsd.setScale(scale); - icon = dr; - scale = getNormalizer().getScale(icon, outIconBounds, null, null); - - ((ColorDrawable) dr.getBackground()).setColor(mWrapperBackgroundColor); - } - } else { +// if (shrinkNonAdaptiveIcons && ATLEAST_OREO) { +// if (mWrapperIcon == null) { +// mWrapperIcon = mContext.getDrawable(R.drawable.adaptive_icon_drawable_wrapper) +// .mutate(); +// } +// AdaptiveIconDrawable dr = (AdaptiveIconDrawable) mWrapperIcon; +// dr.setBounds(0, 0, 1, 1); +// boolean[] outShape = new boolean[1]; +// scale = getNormalizer().getScale(icon, outIconBounds, dr.getIconMask(), outShape); +// if (!(icon instanceof AdaptiveIconDrawable) && !outShape[0]) { +// FixedScaleDrawable fsd = ((FixedScaleDrawable) dr.getForeground()); +// fsd.setDrawable(icon); +// fsd.setScale(scale); +// icon = dr; +// scale = getNormalizer().getScale(icon, outIconBounds, null, null); +// +// ((ColorDrawable) dr.getBackground()).setColor(mWrapperBackgroundColor); +// } +// } else { scale = getNormalizer().getScale(icon, outIconBounds, null, null); - } +// } outScale[0] = scale; return icon;