Merge "Change color of policy info and build status text view" into main (6b8a06b0) · Commits · e / os / android_frameworks_base

packages/SystemUI/compose/features/src/com/android/systemui/qs/footer/ui/compose/FooterActions.kt

+7 −1

Original line number	Diff line number	Diff line
		@@ -406,7 +406,11 @@ private fun TextButton(
		Modifier.padding(horizontal = dimensionResource(R.dimen.qs_footer_padding)),
		verticalAlignment = Alignment.CenterVertically,
		) {
		Icon(icon, Modifier.padding(end = 12.dp).size(20.dp))
		Icon(
		icon,
		Modifier.padding(end = 12.dp).size(20.dp),
		colorAttr(R.attr.onShadeInactiveVariant),
		)

		Text(
		text,
		@@ -415,6 +419,7 @@ private fun TextButton(
		// TODO(b/242040009): Remove this letter spacing. We should only use the M3 text
		// styles without modifying them.
		letterSpacing = 0.01.em,
		color = colorAttr(R.attr.onShadeInactiveVariant),
		maxLines = 1,
		overflow = TextOverflow.Ellipsis,
		)
		@@ -428,6 +433,7 @@ private fun TextButton(
		painterResource(com.android.internal.R.drawable.ic_chevron_end),
		contentDescription = null,
		Modifier.padding(start = 8.dp).size(20.dp),
		colorAttr(R.attr.onShadeInactiveVariant),
		)
		}
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -186,7 +186,7 @@
		</style>

		<style name="TextAppearance.QS.Status.Build">
		<item name="android:textColor">?attr/onSurfaceVariant</item>
		<item name="android:textColor">?attr/onShadeInactiveVariant</item>
		</style>

		<style name="TextAppearance.DeviceManagementDialog.Title" parent="@android:style/TextAppearance.DeviceDefault.DialogWindowTitle"/>