From 3b17f288f51c2a5007b436e95ea11e3b68ea2f70 Mon Sep 17 00:00:00 2001 From: Anay Wadhera Date: Sat, 6 Mar 2021 23:57:30 -0800 Subject: iconloaderlib: Allow extension of certain fields Change-Id: I0bfcd75d5bf801f10af4e35e2c37d584e273d57a --- .../src/com/android/launcher3/icons/BaseIconFactory.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/iconloaderlib/src/com/android/launcher3/icons/BaseIconFactory.java b/iconloaderlib/src/com/android/launcher3/icons/BaseIconFactory.java index 31a923e..5b410ec 100644 --- a/iconloaderlib/src/com/android/launcher3/icons/BaseIconFactory.java +++ b/iconloaderlib/src/com/android/launcher3/icons/BaseIconFactory.java @@ -33,7 +33,7 @@ public class BaseIconFactory implements AutoCloseable { private static final String TAG = "BaseIconFactory"; private static final int DEFAULT_WRAPPER_BACKGROUND = Color.WHITE; - static final boolean ATLEAST_OREO = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O; + protected static final boolean ATLEAST_OREO = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O; static final boolean ATLEAST_P = Build.VERSION.SDK_INT >= Build.VERSION_CODES.P; private static final float ICON_BADGE_SCALE = 0.444f; @@ -53,8 +53,8 @@ public class BaseIconFactory implements AutoCloseable { private ShadowGenerator mShadowGenerator; private final boolean mShapeDetection; - private Drawable mWrapperIcon; - private int mWrapperBackgroundColor = DEFAULT_WRAPPER_BACKGROUND; + public Drawable mWrapperIcon; + protected int mWrapperBackgroundColor = DEFAULT_WRAPPER_BACKGROUND; protected BaseIconFactory(Context context, int fillResIconDpi, int iconBitmapSize, boolean shapeDetection) { @@ -220,7 +220,7 @@ public class BaseIconFactory implements AutoCloseable { mDisableColorExtractor = true; } - private Drawable normalizeAndWrapToAdaptiveIcon(@NonNull Drawable icon, + protected Drawable normalizeAndWrapToAdaptiveIcon(@NonNull Drawable icon, boolean shrinkNonAdaptiveIcons, RectF outIconBounds, float[] outScale) { if (icon == null) { return null; -- cgit v1.2.3