diff --git a/GITHUB_CHANGELOG.md b/GITHUB_CHANGELOG.md index ff1f20e56a..91e1cfc6f6 100644 --- a/GITHUB_CHANGELOG.md +++ b/GITHUB_CHANGELOG.md @@ -41,6 +41,7 @@ Compatibility list: * [Launcher] Fix folder navigation * [Launcher] Support Android 12.0/12.1/13/14/15 * [Lawnchair/Smartspace] At-a-Glance can't launch activity due to background startup restrictions on Android 14 and above +* [Launcher] Use Lawnchair theming colour for allapps ### 🥞 Snapshot 9 (Development 4 Release 1) diff --git a/lawnchair/src/app/lawnchair/theme/color/tokens/ColorTokens.kt b/lawnchair/src/app/lawnchair/theme/color/tokens/ColorTokens.kt index 89d41b0507..36ca896e81 100644 --- a/lawnchair/src/app/lawnchair/theme/color/tokens/ColorTokens.kt +++ b/lawnchair/src/app/lawnchair/theme/color/tokens/ColorTokens.kt @@ -173,6 +173,18 @@ object ColorTokens { // Material 3 Expressive @JvmField val ExpressiveAllApps = DayNightColorToken(Accent1_100, Accent1_800) + + @JvmField val BottomSheetBackgroundColorBlurFallback = DayNightColorToken(Accent2_800, Accent2_800) + + @JvmField val shade_panel_fg_color = DayNightColorToken( + Neutral1_100.setAlpha(0.32f), + Neutral1_800.setAlpha(0.32f), + ) + + @JvmField val shade_panel_bg_color = DayNightColorToken( + Neutral1_500.setLStar(98.0).setAlpha(0.32f), + Neutral1_500.setLStar(4.0).setAlpha(0.32f), + ) } @Composable diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/HintState.java b/quickstep/src/com/android/launcher3/uioverrides/states/HintState.java index bfa7d26cf9..20a62abc81 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/states/HintState.java +++ b/quickstep/src/com/android/launcher3/uioverrides/states/HintState.java @@ -64,13 +64,11 @@ public class HintState extends LauncherState { @Override public ScrimColors getWorkspaceScrimColor(Launcher launcher) { - // pE-TODO(QPR1): return ColorUtils.setAlphaComponent( - // ColorTokens.OverviewScrim.resolveColor(launcher), 100); - ScrimColors overviewStateColor = OVERVIEW.getWorkspaceScrimColor(launcher); +// ScrimColors overviewStateColor = OVERVIEW.getWorkspaceScrimColor(launcher); return new ScrimColors( /* backgroundColor */ - ColorUtils.setAlphaComponent(overviewStateColor.getBackgroundColor(), - Math.round(Color.valueOf(overviewStateColor.getBackgroundColor()).alpha() + ColorUtils.setAlphaComponent(ColorTokens.OverviewScrim.resolveColor(launcher), + Math.round(Color.valueOf(ColorTokens.OverviewScrim.resolveColor(launcher)).alpha() * 100)), /* foregroundColor */ Color.TRANSPARENT); } diff --git a/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java b/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java index 0bc36e40e0..2499c161b8 100644 --- a/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java +++ b/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java @@ -338,13 +338,10 @@ public class ActivityAllAppsContainerView }; if (Flags.allAppsBlur()) { - // pE-TODO(QPR1): Return int color value directly, not a resource ID for custom colours - int layerFg = getContext().getColor(R.color.blur_shade_panel_fg); - int layerBg = getContext().getColor(R.color.blur_shade_panel_bg); + int layerFg = ColorTokens.shade_panel_fg_color.resolveColor(getContext()); + int layerBg = ColorTokens.shade_panel_bg_color.resolveColor(getContext()); mBottomSheetBackgroundColorOverBlur = ColorUtils.compositeColors(layerFg, layerBg); - mBottomSheetBackgroundColorBlurFallback = getContext().getColor( - Utilities.isDarkTheme(getContext()) ? android.R.color.system_accent2_800 - : android.R.color.system_accent2_200); + mBottomSheetBackgroundColorBlurFallback = ColorTokens.BottomSheetBackgroundColorBlurFallback.resolveColor(getContext()); } mBottomSheetBackgroundColorLegacy = ColorTokens.SurfaceDimColor.resolveColor(getContext());