diff options
| author | 2025-03-18 04:30:05 -0700 | |
|---|---|---|
| committer | 2025-03-18 04:30:05 -0700 | |
| commit | 5290e88087f50dcad2933e8dc05d828b618ea62a (patch) | |
| tree | 7b9568d136054be85ba2992e91061116033fdc3e | |
| parent | bbcc37694df2029feaf30808373e35894a185cae (diff) | |
| parent | 8a2c1243685047d3b7ecb4c777e3c048ff262b42 (diff) | |
Merge "Update disabled colors to add make them more contrast" into main
2 files changed, 4 insertions, 0 deletions
diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/volume/panel/component/volume/ui/composable/VolumeSlider.kt b/packages/SystemUI/compose/features/src/com/android/systemui/volume/panel/component/volume/ui/composable/VolumeSlider.kt index f9492dad85df..a65afad9cb7a 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/volume/panel/component/volume/ui/composable/VolumeSlider.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/volume/panel/component/volume/ui/composable/VolumeSlider.kt @@ -127,6 +127,8 @@ fun VolumeSlider( SliderDefaults.colors( activeTickColor = MaterialTheme.colorScheme.surfaceContainerHigh, inactiveTrackColor = MaterialTheme.colorScheme.surfaceContainerHigh, + disabledActiveTickColor = MaterialTheme.colorScheme.surfaceContainerHigh, + disabledInactiveTrackColor = MaterialTheme.colorScheme.surfaceContainerHigh, ) Slider( value = state.value, diff --git a/packages/SystemUI/src/com/android/systemui/volume/dialog/sliders/ui/VolumeDialogSliderViewBinder.kt b/packages/SystemUI/src/com/android/systemui/volume/dialog/sliders/ui/VolumeDialogSliderViewBinder.kt index db4b8ef5aef7..dc41e90faeaf 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/dialog/sliders/ui/VolumeDialogSliderViewBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/volume/dialog/sliders/ui/VolumeDialogSliderViewBinder.kt @@ -92,6 +92,8 @@ private fun VolumeDialogSlider( SliderDefaults.colors( activeTickColor = MaterialTheme.colorScheme.surfaceContainerHighest, inactiveTrackColor = MaterialTheme.colorScheme.surfaceContainerHighest, + disabledActiveTickColor = MaterialTheme.colorScheme.surfaceContainerHighest, + disabledInactiveTrackColor = MaterialTheme.colorScheme.surfaceContainerHighest, ) val collectedSliderStateModel by viewModel.state.collectAsStateWithLifecycle(null) val sliderStateModel = collectedSliderStateModel ?: return |