Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09f7681c authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Android (Google) Code Review
Browse files

Merge changes Ie665b012,I9fcc6486 into main 

* changes:
  [SB][Chips] Localize the screen record 3-2-1 countdown text.
  [SB][Chips] Have chip text padding be on correct side for RTL.
parents ec6978a1 2e9dbd7f

packages/SystemUI/src/com/android/systemui/statusbar/chips/ui/compose/ChipContent.kt

+3 −2
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ import com.android.systemui.statusbar.chips.ui.model.OngoingActivityChipModel 
import com.android.systemui.statusbar.chips.ui.viewmodel.formatTimeRemainingData

import com.android.systemui.statusbar.chips.ui.viewmodel.rememberChronometerState

import com.android.systemui.statusbar.chips.ui.viewmodel.rememberTimeRemainingState

import java.text.NumberFormat

import kotlin.math.min



@OptIn(ExperimentalMaterial3ExpressiveApi::class)
@@ -107,7 +108,7 @@ fun ChipContent( 
        }



        is OngoingActivityChipModel.Content.Countdown -> {

            val text = viewModel.secondsUntilStarted.toString()

            val text = NumberFormat.getIntegerInstance().format(viewModel.secondsUntilStarted)

            Text(

                text = text,

                style = textStyle,
@@ -289,7 +290,7 @@ private class HideTextIfDoesNotFitNode( 
            val height = placeable.height

            val width = placeable.width

            layout(width + horizontalPadding.roundToPx(), height) {

                placeable.place(startPadding.roundToPx(), 0)

                placeable.placeRelative(x = startPadding.roundToPx(), y = 0)

            }

        } else {

            layout(0, 0) {}