Merge "[SB][ComposeIcons] Set tint in CompositionLocalProvider" into main (826091da) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/systemstatusicons/ui/compose/SystemStatusIcons.kt

+23 −22

Original line number	Diff line number	Diff line
		@@ -20,7 +20,9 @@ import androidx.compose.foundation.layout.Arrangement
		import androidx.compose.foundation.layout.Row
		import androidx.compose.foundation.layout.padding
		import androidx.compose.foundation.layout.size
		import androidx.compose.material3.LocalContentColor
		import androidx.compose.runtime.Composable
		import androidx.compose.runtime.CompositionLocalProvider
		import androidx.compose.runtime.getValue
		import androidx.compose.runtime.setValue
		import androidx.compose.ui.Alignment
		@@ -49,6 +51,7 @@ fun SystemStatusIcons(
		val viewModel =
		rememberViewModel(traceName = "SystemStatusIcons") { viewModelFactory.create(context) }

		CompositionLocalProvider(LocalContentColor provides tint) {
		Row(
		verticalAlignment = Alignment.CenterVertically,
		horizontalArrangement = Arrangement.spacedBy(6.dp),
		@@ -61,12 +64,9 @@ fun SystemStatusIcons(
		when (iconViewModel) {
		is SystemStatusIconViewModel.Default ->
		iconViewModel.icon?.let {
		Icon(
		icon = it,
		modifier = Modifier.size(20.dp).padding(1.dp),
		tint = tint,
		)
		Icon(icon = it, modifier = Modifier.size(20.dp).padding(1.dp))
		}

		is SystemStatusIconViewModel.MobileIcons -> {
		MobileIcons(
		iconViewModel.mobileIconsViewModel,
		@@ -77,3 +77,4 @@ fun SystemStatusIcons(
		}
		}
		}
		}