Skip to content

Commit 6484043

Browse files
neobuddy89joeyhuab
authored andcommitted
SystemUI: Use statusbar text size for ongoing chip text
* Reduce marquee delay as well. * Maybe add setting for font size?! Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
1 parent 59d04fc commit 6484043

1 file changed

Lines changed: 14 additions & 3 deletions

File tree

packages/SystemUI/src/com/android/systemui/statusbar/OngoingActionProgressCompose.kt

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ import androidx.compose.ui.input.pointer.pointerInput
7373
import androidx.compose.ui.layout.ContentScale
7474
import androidx.compose.ui.layout.onSizeChanged
7575
import androidx.compose.ui.platform.LocalConfiguration
76+
import androidx.compose.ui.platform.LocalContext
77+
import androidx.compose.ui.platform.LocalDensity
7678
import androidx.compose.ui.res.colorResource
7779
import androidx.compose.ui.res.painterResource
7880
import androidx.compose.ui.text.TextStyle
@@ -561,6 +563,12 @@ private fun MusicChip(
561563
else
562564
colorResource(android.R.color.system_accent1_100)
563565

566+
val shadeHeaderTextSize = with(LocalDensity.current) {
567+
LocalContext.current.resources
568+
.getDimension(R.dimen.status_bar_shade_header_text_size_sp)
569+
.toSp()
570+
}
571+
564572
Row(
565573
modifier = Modifier
566574
.animateContentSize(animationSpec = tween(durationMillis = 300, easing = FastOutSlowInEasing))
@@ -588,12 +596,15 @@ private fun MusicChip(
588596
) {
589597
Text(
590598
text = state.trackTitle ?: "",
591-
style = TextStyle(color = text, fontSize = 10.sp,
592-
fontWeight = FontWeight.Normal),
599+
style = TextStyle(
600+
color = text,
601+
fontSize = shadeHeaderTextSize,
602+
fontWeight = FontWeight.Normal
603+
),
593604
maxLines = 1,
594605
overflow = TextOverflow.Ellipsis,
595606
modifier = Modifier
596-
.basicMarquee(initialDelayMillis = 15_000, repeatDelayMillis = 15_000)
607+
.basicMarquee(initialDelayMillis = 2_000, repeatDelayMillis = 10_000)
597608
.padding(start = 1.dp)
598609
.onSizeChanged { size -> chipAtMaxWidth = size.width >= chipMaxWidthPx }
599610
)

0 commit comments

Comments
 (0)