Merge "Update PlatformSlider color scheme and hide a11y dot when its disabled" into main (5be35d77) · Commits · e / os / android_frameworks_base

packages/SystemUI/compose/core/src/com/android/compose/PlatformSlider.kt

+17 −15

Original line number	Diff line number	Diff line
		@@ -62,6 +62,7 @@ import androidx.compose.ui.layout.Placeable
		import androidx.compose.ui.layout.layoutId
		import androidx.compose.ui.platform.LocalDensity
		import androidx.compose.ui.platform.LocalLayoutDirection
		import androidx.compose.ui.res.colorResource
		import androidx.compose.ui.unit.Constraints
		import androidx.compose.ui.unit.Dp
		import androidx.compose.ui.unit.IntOffset
		@@ -69,7 +70,6 @@ import androidx.compose.ui.unit.LayoutDirection
		import androidx.compose.ui.unit.dp
		import androidx.compose.ui.util.fastFirst
		import androidx.compose.ui.util.fastFirstOrNull
		import com.android.compose.theme.LocalAndroidColorScheme

		/**
		* Platform slider implementation that displays a slider with an [icon] and a [label] at the start.
		@@ -143,6 +143,7 @@ fun PlatformSlider(
		thumb = { Spacer(Modifier.size(thumbSize)) },
		)

		if (enabled) {
		Spacer(
		Modifier.padding(8.dp)
		.size(4.dp)
		@@ -151,6 +152,7 @@ fun PlatformSlider(
		)
		}
		}
		}

		private enum class TrackComponent(val zIndex: Float) {
		Background(0f),
		@@ -219,9 +221,9 @@ private fun Track(
		)
		Box(
		modifier =
		Modifier.layoutId(TrackComponent.Label).offset {
		IntOffset(offsetX.toInt(), 0)
		},
		Modifier.layoutId(TrackComponent.Label)
		.offset { IntOffset(offsetX.toInt(), 0) }
		.padding(end = 16.dp),
		contentAlignment = Alignment.CenterStart,
		) {
		CompositionLocalProvider(
		@@ -452,11 +454,11 @@ object PlatformSliderDefaults {
		@Composable
		private fun lightThemePlatformSliderColors() =
		PlatformSliderColors(
		trackColor = LocalAndroidColorScheme.current.tertiaryFixedDim,
		trackColor = colorResource(android.R.color.system_accent3_200),
		indicatorColor = MaterialTheme.colorScheme.tertiary,
		iconColor = MaterialTheme.colorScheme.onTertiary,
		labelColorOnIndicator = MaterialTheme.colorScheme.onTertiary,
		labelColorOnTrack = LocalAndroidColorScheme.current.onTertiaryFixed,
		labelColorOnTrack = MaterialTheme.colorScheme.onTertiaryContainer,
		disabledTrackColor = MaterialTheme.colorScheme.surfaceContainerHighest,
		disabledIndicatorColor = MaterialTheme.colorScheme.surfaceContainerHighest,
		disabledIconColor = MaterialTheme.colorScheme.outline,
		@@ -467,11 +469,11 @@ private fun lightThemePlatformSliderColors() =
		@Composable
		private fun darkThemePlatformSliderColors() =
		PlatformSliderColors(
		trackColor = MaterialTheme.colorScheme.tertiary,
		trackColor = colorResource(android.R.color.system_accent3_600),
		indicatorColor = MaterialTheme.colorScheme.tertiary,
		iconColor = MaterialTheme.colorScheme.onTertiaryContainer,
		iconColor = MaterialTheme.colorScheme.onTertiary,
		labelColorOnIndicator = MaterialTheme.colorScheme.onTertiary,
		labelColorOnTrack = LocalAndroidColorScheme.current.onTertiaryFixed,
		labelColorOnTrack = colorResource(android.R.color.system_accent3_900),
		disabledTrackColor = MaterialTheme.colorScheme.surfaceContainerHighest,
		disabledIndicatorColor = MaterialTheme.colorScheme.surfaceContainerHighest,
		disabledIconColor = MaterialTheme.colorScheme.outline,