diff --git a/GITHUB_CHANGELOG.md b/GITHUB_CHANGELOG.md index 2f2a47388f..21a6d89882 100644 --- a/GITHUB_CHANGELOG.md +++ b/GITHUB_CHANGELOG.md @@ -48,6 +48,7 @@ Compatibility list: * [Lawnchair/Iconloaderlib] Crash when trying to set `null` monochrome icon on less than Android 12.1 * [SystemUI/Unfold] Crash when getting configuration for foldable-specific resources * [Lawnchair/Iconloaderlib] Don't parse monochrome drawable in Android 12.1 or less +* [Launcher3/AllApps] Allow theming of Expressive allapps ### 🥞 Development 2 diff --git a/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java b/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java index 3c43b1c766..aa7a1c9f09 100644 --- a/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java +++ b/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java @@ -333,12 +333,10 @@ public class ActivityAllAppsContainerView 0 // Bottom left }; if (Flags.allAppsBlur()) { - // Lawnchair-TODO-Colour: ExpressiveAllApps - // int resId = ColorTokens.ExpressiveAllApps.resolveColor(getContext()); - int resId = Utilities.isDarkTheme(getContext()) - ? android.R.color.system_accent1_800 : android.R.color.system_accent1_100; - int layerAbove = ColorUtils.setAlphaComponent(getResources().getColor(resId, null), - (int) (0.4f * 255)); + // LC: Return int color value directly, not a resource ID for custom colours + int baseColor = ColorTokens.ExpressiveAllApps.resolveColor(getContext()); + + int layerAbove = ColorUtils.setAlphaComponent(baseColor, (int) (0.4f * 255)); int layerBelow = ColorUtils.setAlphaComponent(Color.WHITE, (int) (0.1f * 255)); mBottomSheetBackgroundColor = ColorUtils.compositeColors(layerAbove, layerBelow); } else {