Merge "Use correct icons for BundleHeaderGuts switch" into main (58b6ce27) · Commits · e / os / android_frameworks_base

packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/row/BundleHeaderGuts.kt

+19 −8

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ import androidx.compose.foundation.layout.size
		import androidx.compose.foundation.shape.RoundedCornerShape
		import androidx.compose.material.icons.Icons
		import androidx.compose.material.icons.filled.Check
		import androidx.compose.material.icons.filled.Close
		import androidx.compose.material.icons.filled.Settings
		import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
		import androidx.compose.material3.Icon
		@@ -145,13 +146,23 @@ private fun ContentRow(viewModel: BundleHeaderGutsViewModel, modifier: Modifier
		Switch(
		checked = viewModel.switchState,
		onCheckedChange = null, // handled at the Row level above
		thumbContent = {
		thumbContent =
		if (viewModel.switchState) {
		{
		Icon(
		imageVector = Icons.Default.Check,
		contentDescription = null,
		modifier = Modifier.size(SwitchDefaults.IconSize),
		tint = MaterialTheme.colorScheme.onSecondaryContainer,
		)
		}
		} else {
		{
		Icon(
		imageVector = Icons.Default.Close,
		contentDescription = null,
		modifier = Modifier.size(SwitchDefaults.IconSize),
		)
		}
		},
		)
		}