From f9d8c1cb31e8fa9dc37d462b68bc2a73803393b3 Mon Sep 17 00:00:00 2001 From: Administrator <981964879@qq.com> Date: Wed, 4 Nov 2020 14:49:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=A1=8C=E9=9D=A2=E5=9B=BE?= =?UTF-8?q?=E6=A0=87=E5=BA=95=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../android/uiuios/icons/BaseIconFactory.java | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) 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;