From 2d5fd2b7cd85b83fb3b2741ae55efc4fb5cf788f Mon Sep 17 00:00:00 2001 From: Pun Butrach Date: Sun, 7 Jun 2026 20:21:57 +0700 Subject: [PATCH] fix: Custom notification dot colour not being applied (#6851) Signed-off-by: Pun Butrach --- lawnchair/src/app/lawnchair/theme/color/tokens/ColorTokens.kt | 2 -- platform_frameworks_libs_systemui | 2 +- src/com/android/launcher3/folder/PreviewBackground.java | 3 ++- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lawnchair/src/app/lawnchair/theme/color/tokens/ColorTokens.kt b/lawnchair/src/app/lawnchair/theme/color/tokens/ColorTokens.kt index 2c7c7c53b1..f8b5bc3324 100644 --- a/lawnchair/src/app/lawnchair/theme/color/tokens/ColorTokens.kt +++ b/lawnchair/src/app/lawnchair/theme/color/tokens/ColorTokens.kt @@ -133,8 +133,6 @@ object ColorTokens { @JvmField val SearchboxHighlightBlur = SearchboxHighlight.setAlpha(.54f) - @JvmField val FolderDotColor = Accent3_100 - @JvmField val DotColor = Accent3_200 @JvmField val FolderBackgroundColor = DayNightColorToken(Neutral1_50.setLStar(94.0), Neutral2_900.setLStar(12.0)) diff --git a/platform_frameworks_libs_systemui b/platform_frameworks_libs_systemui index 33becd76df..ce6a6128ef 160000 --- a/platform_frameworks_libs_systemui +++ b/platform_frameworks_libs_systemui @@ -1 +1 @@ -Subproject commit 33becd76df70a2703f0d5e376ee4b0fdf3917662 +Subproject commit ce6a6128efeccd6188dd45f2c1231cc9bd053df9 diff --git a/src/com/android/launcher3/folder/PreviewBackground.java b/src/com/android/launcher3/folder/PreviewBackground.java index 8cff5f9739..352154288d 100644 --- a/src/com/android/launcher3/folder/PreviewBackground.java +++ b/src/com/android/launcher3/folder/PreviewBackground.java @@ -196,7 +196,8 @@ public class PreviewBackground extends DelegatedCellDrawing { int folderColor = colorOption.getColorPreferenceEntry().getLightColor().invoke(context); TypedArray ta = context.getTheme().obtainStyledAttributes(R.styleable.FolderIconPreview); - mDotColor = ColorTokens.FolderDotColor.resolveColor(context); + ColorOption dotColorOption = PreferenceExtensionsKt.firstBlocking(preferenceManager2.getNotificationDotColor()); + mDotColor = dotColorOption.getColorPreferenceEntry().getLightColor().invoke(context); mStrokeColor = ColorTokens.FolderIconBorderColor.resolveColor(context); if (folderColor != 0) { mBgColor = folderColor;