From 2edf315ec20df1d41da4b72c97bcd69d23f91a05 Mon Sep 17 00:00:00 2001 From: MrSluffy Date: Tue, 3 Dec 2024 10:00:21 +0800 Subject: [PATCH] fixed auto-adaptive option --- platform_frameworks_libs_systemui | 2 +- src/com/android/launcher3/Utilities.java | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/platform_frameworks_libs_systemui b/platform_frameworks_libs_systemui index c4f10d7349..7ee8e49de7 160000 --- a/platform_frameworks_libs_systemui +++ b/platform_frameworks_libs_systemui @@ -1 +1 @@ -Subproject commit c4f10d734995f639966f821ae7b6b0f9df6c4ac2 +Subproject commit 7ee8e49de755b24d73ca373bb89fbdf7c9af91ae diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java index 5183dac5c6..498c1be973 100644 --- a/src/com/android/launcher3/Utilities.java +++ b/src/com/android/launcher3/Utilities.java @@ -780,10 +780,13 @@ public final class Utilities { } // Inject monochrome icon drawable - if (ATLEAST_T && useTheme) { + if (useTheme) { result.mutate(); int[] colors = ThemedIconDrawable.getColors(context); - Drawable mono = result.getMonochrome(); + Drawable mono = null; + if (ATLEAST_T) { + mono = result.getMonochrome(); + } if (mono != null) { mono.setTint(colors[1]); @@ -794,7 +797,9 @@ public final class Utilities { // Use BitmapDrawable instead of FastBitmapDrawable so that the colorState is // preserved in constantState mono = new BitmapDrawable(monoBitmap); - mono.setColorFilter(new BlendModeColorFilter(colors[1], BlendMode.SRC_IN)); + if (ATLEAST_Q) { + mono.setColorFilter(new BlendModeColorFilter(colors[1], BlendMode.SRC_IN)); + } // Inset the drawable according to the AdaptiveIconDrawable layers mono = new InsetDrawable(mono, getExtraInsetFraction() / 2); }