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

Commit d4035766 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Match Clock properties from xml" into main

parents 25daa65e c07acc5e
Loading
Loading
Loading
Loading
+15 −3
Original line number Original line Diff line number Diff line
@@ -18,6 +18,8 @@
package com.android.systemui.shade.ui.composable
package com.android.systemui.shade.ui.composable


import android.view.ContextThemeWrapper
import android.view.ContextThemeWrapper
import android.view.Gravity
import android.view.View
import android.view.ViewGroup
import android.view.ViewGroup
import androidx.annotation.ColorInt
import androidx.annotation.ColorInt
import androidx.compose.animation.core.Animatable
import androidx.compose.animation.core.Animatable
@@ -38,6 +40,7 @@ import androidx.compose.foundation.layout.offset
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.layout.widthIn
import androidx.compose.foundation.layout.widthIn
import androidx.compose.foundation.layout.wrapContentWidth
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.LaunchedEffect
@@ -522,13 +525,22 @@ private fun ContentScope.Clock(
            AndroidView(
            AndroidView(
                factory = { context ->
                factory = { context ->
                    Clock(
                    Clock(
                        ContextThemeWrapper(context, R.style.Theme_SystemUI_QuickSettings_Header),
                            ContextThemeWrapper(
                                context,
                                R.style.Theme_SystemUI_QuickSettings_Header,
                            ),
                            null,
                            null,
                        )
                        )
                        .apply {
                            isSingleLine = true
                            textDirection = View.TEXT_DIRECTION_LOCALE
                            gravity = Gravity.START or Gravity.CENTER_VERTICAL
                        }
                },
                },
                update = { view -> textColor?.let { view.setTextColor(it.toArgb()) } },
                update = { view -> textColor?.let { view.setTextColor(it.toArgb()) } },
                modifier =
                modifier =
                    modifier
                    modifier
                        .wrapContentWidth(unbounded = true)
                        // use graphicsLayer instead of Modifier.scale to anchor transform to the
                        // use graphicsLayer instead of Modifier.scale to anchor transform to the
                        // (start, top) corner
                        // (start, top) corner
                        .graphicsLayer {
                        .graphicsLayer {