Merge "[Flexiglass] New typography for compose bouncer's status message" into main (5925e116) · Commits · e / os / android_frameworks_base

packages/SystemUI/compose/features/src/com/android/systemui/bouncer/ui/composable/BouncerContent.kt

+4 −5

Original line number	Diff line number	Diff line
		@@ -53,6 +53,7 @@ import androidx.compose.material.icons.filled.KeyboardArrowDown
		import androidx.compose.material3.ButtonDefaults
		import androidx.compose.material3.DropdownMenu
		import androidx.compose.material3.DropdownMenuItem
		import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
		import androidx.compose.material3.Icon
		import androidx.compose.material3.MaterialTheme
		import androidx.compose.material3.Text
		@@ -90,7 +91,6 @@ import androidx.compose.ui.unit.DpOffset
		import androidx.compose.ui.unit.IntOffset
		import androidx.compose.ui.unit.LayoutDirection
		import androidx.compose.ui.unit.dp
		import androidx.compose.ui.unit.sp
		import androidx.compose.ui.unit.times
		import androidx.lifecycle.compose.collectAsStateWithLifecycle
		import com.android.compose.PlatformButton
		@@ -682,6 +682,7 @@ private fun ContentScope.FoldableScene(
		}
		}

		@OptIn(ExperimentalMaterial3ExpressiveApi::class)
		@Composable
		private fun StatusMessage(viewModel: BouncerMessageViewModel, modifier: Modifier = Modifier) {
		val message: MessageViewModel? by viewModel.message.collectAsStateWithLifecycle()
		@@ -705,16 +706,14 @@ private fun StatusMessage(viewModel: BouncerMessageViewModel, modifier: Modifier
		Text(
		text = it.text,
		color = MaterialTheme.colorScheme.onSurface,
		fontSize = 18.sp,
		lineHeight = 24.sp,
		style = MaterialTheme.typography.titleLargeEmphasized,
		overflow = TextOverflow.Ellipsis,
		)
		Spacer(modifier = Modifier.size(10.dp))
		Text(
		text = it.secondaryText ?: "",
		color = MaterialTheme.colorScheme.onSurface,
		fontSize = 14.sp,
		lineHeight = 20.sp,
		style = MaterialTheme.typography.titleMediumEmphasized,
		overflow = TextOverflow.Ellipsis,
		maxLines = 2,
		)