diff --git a/patches/personal/platform_frameworks_base/0010-SystemUI-Correctly-monet-theme-the-new-volume-panel.patch b/patches/personal/platform_frameworks_base/0010-SystemUI-Correctly-monet-theme-the-new-volume-panel.patch new file mode 100644 index 00000000..d35a0f4a --- /dev/null +++ b/patches/personal/platform_frameworks_base/0010-SystemUI-Correctly-monet-theme-the-new-volume-panel.patch @@ -0,0 +1,85 @@ +From 117afed975ebfb70a916c3f5c8a64da0eaa2f208 Mon Sep 17 00:00:00 2001 +From: Ido Ben-Hur +Date: Wed, 19 Jun 2024 20:44:06 +0300 +Subject: [PATCH 10/10] SystemUI: Correctly monet theme the new volume panel + +--- + .../src/com/android/compose/PlatformSlider.kt | 16 ++++++++-------- + .../button/ui/composable/ButtonComponent.kt | 6 +++--- + .../ui/composable/ToggleButtonComponent.kt | 8 ++++---- + 3 files changed, 15 insertions(+), 15 deletions(-) + +diff --git a/packages/SystemUI/compose/core/src/com/android/compose/PlatformSlider.kt b/packages/SystemUI/compose/core/src/com/android/compose/PlatformSlider.kt +index ef15c846..5ed83805 100644 +--- a/packages/SystemUI/compose/core/src/com/android/compose/PlatformSlider.kt ++++ b/packages/SystemUI/compose/core/src/com/android/compose/PlatformSlider.kt +@@ -300,10 +300,10 @@ object PlatformSliderDefaults { + @Composable + private fun lightThemePlatformSliderColors() = + PlatformSliderColors( +- trackColor = MaterialTheme.colorScheme.tertiaryContainer, +- indicatorColor = LocalAndroidColorScheme.current.tertiaryFixedDim, +- iconColor = MaterialTheme.colorScheme.onTertiaryContainer, +- labelColor = MaterialTheme.colorScheme.onTertiaryContainer, ++ trackColor = MaterialTheme.colorScheme.primaryContainer, ++ indicatorColor = LocalAndroidColorScheme.current.primaryFixedDim, ++ iconColor = MaterialTheme.colorScheme.onPrimaryContainer, ++ labelColor = MaterialTheme.colorScheme.onPrimaryContainer, + disabledTrackColor = MaterialTheme.colorScheme.surfaceContainerHighest, + disabledIndicatorColor = MaterialTheme.colorScheme.surfaceContainerHighest, + disabledIconColor = MaterialTheme.colorScheme.outline, +@@ -314,10 +314,10 @@ private fun lightThemePlatformSliderColors() = + @Composable + private fun darkThemePlatformSliderColors() = + PlatformSliderColors( +- trackColor = MaterialTheme.colorScheme.onTertiary, +- indicatorColor = LocalAndroidColorScheme.current.onTertiaryFixedVariant, +- iconColor = MaterialTheme.colorScheme.onTertiaryContainer, +- labelColor = MaterialTheme.colorScheme.onTertiaryContainer, ++ trackColor = MaterialTheme.colorScheme.onPrimary, ++ indicatorColor = LocalAndroidColorScheme.current.onPrimaryFixedVariant, ++ iconColor = MaterialTheme.colorScheme.onPrimaryContainer, ++ labelColor = MaterialTheme.colorScheme.onPrimaryContainer, + disabledTrackColor = MaterialTheme.colorScheme.surfaceContainerHighest, + disabledIndicatorColor = MaterialTheme.colorScheme.surfaceContainerHighest, + disabledIconColor = MaterialTheme.colorScheme.outline, +diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/volume/panel/component/button/ui/composable/ButtonComponent.kt b/packages/SystemUI/compose/features/src/com/android/systemui/volume/panel/component/button/ui/composable/ButtonComponent.kt +index 5f7bd47f..68ff0a88 100644 +--- a/packages/SystemUI/compose/features/src/com/android/systemui/volume/panel/component/button/ui/composable/ButtonComponent.kt ++++ b/packages/SystemUI/compose/features/src/com/android/systemui/volume/panel/component/button/ui/composable/ButtonComponent.kt +@@ -60,10 +60,10 @@ class ButtonComponent( + ) { + Expandable( + modifier = Modifier.height(64.dp).fillMaxWidth(), +- color = MaterialTheme.colorScheme.primaryContainer, ++ color = MaterialTheme.colorScheme.primary, + shape = RoundedCornerShape(28.dp), +- contentColor = MaterialTheme.colorScheme.onPrimaryContainer, +- borderStroke = BorderStroke(8.dp, MaterialTheme.colorScheme.surface), ++ contentColor = MaterialTheme.colorScheme.onPrimary, ++ borderStroke = BorderStroke(8.dp, MaterialTheme.colorScheme.primary), + onClick = onClick, + ) { + Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { +diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/volume/panel/component/button/ui/composable/ToggleButtonComponent.kt b/packages/SystemUI/compose/features/src/com/android/systemui/volume/panel/component/button/ui/composable/ToggleButtonComponent.kt +index dfee684c..8991426e 100644 +--- a/packages/SystemUI/compose/features/src/com/android/systemui/volume/panel/component/button/ui/composable/ToggleButtonComponent.kt ++++ b/packages/SystemUI/compose/features/src/com/android/systemui/volume/panel/component/button/ui/composable/ToggleButtonComponent.kt +@@ -62,10 +62,10 @@ class ToggleButtonComponent( + shape = RoundedCornerShape(28.dp), + colors = + IconButtonDefaults.outlinedIconToggleButtonColors( +- containerColor = MaterialTheme.colorScheme.surface, +- contentColor = MaterialTheme.colorScheme.onSurfaceVariant, +- checkedContainerColor = MaterialTheme.colorScheme.primaryContainer, +- checkedContentColor = MaterialTheme.colorScheme.onPrimaryContainer, ++ containerColor = MaterialTheme.colorScheme.primary, ++ contentColor = MaterialTheme.colorScheme.onPrimary, ++ checkedContainerColor = MaterialTheme.colorScheme.secondary, ++ checkedContentColor = MaterialTheme.colorScheme.onSecondary, + ), + border = BorderStroke(8.dp, MaterialTheme.colorScheme.surface), + ) { +-- +2.34.1 +