diff options
| author | 2024-10-21 15:25:01 -0400 | |
|---|---|---|
| committer | 2024-10-21 16:19:35 -0400 | |
| commit | 8a147e419218cd5c1925da09bdef146972541325 (patch) | |
| tree | c85c9e049d04bfed72dbf31b92f566083beeacaf | |
| parent | 42cdae92b9a9fb024c17fa6615e3671a89464b89 (diff) | |
Make FlexClockView default clock use proper font
Bug: 374787902
Test: manual
Flag: com.android.systemui.clock_reactive_variants
Change-Id: Iecb3782a5b076f78b3702405cfee51835c91429e
| -rw-r--r-- | packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockProvider.kt | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockProvider.kt b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockProvider.kt index 900971bc3927..2a858238c156 100644 --- a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockProvider.kt +++ b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockProvider.kt @@ -39,7 +39,7 @@ class DefaultClockProvider( val resources: Resources, private val hasStepClockAnimation: Boolean = false, private val migratedClocks: Boolean = false, - private val clockReactiveVariants: Boolean = false, + private val isClockReactiveVariantsEnabled: Boolean = false, ) : ClockProvider { private var messageBuffers: ClockMessageBuffers? = null @@ -54,7 +54,7 @@ class DefaultClockProvider( throw IllegalArgumentException("${settings.clockId} is unsupported by $TAG") } - return if (clockReactiveVariants) { + return if (isClockReactiveVariantsEnabled) { val buffer = messageBuffers?.infraMessageBuffer ?: LogcatOnlyMessageBuffer(LogLevel.INFO) val assets = AssetLoader(ctx, ctx, "clocks/", buffer) @@ -84,7 +84,7 @@ class DefaultClockProvider( // TODO(b/352049256): Update placeholder to actual resource resources.getDrawable(R.drawable.clock_default_thumbnail, null), isReactiveToTone = true, - isReactiveToTouch = clockReactiveVariants, + isReactiveToTouch = isClockReactiveVariantsEnabled, axes = listOf(), // TODO: Ater some picker definition ) } @@ -103,7 +103,6 @@ class DefaultClockProvider( timespec = DigitalTimespec.FIRST_DIGIT, style = FontTextStyle( - fontFamily = "google_sans_flex.ttf", lineHeight = 147.25f, fontVariation = "'wght' 603, 'wdth' 100, 'opsz' 144, 'ROND' 100", @@ -112,7 +111,6 @@ class DefaultClockProvider( FontTextStyle( fontVariation = "'wght' 74, 'wdth' 43, 'opsz' 144, 'ROND' 100", - fontFamily = "google_sans_flex.ttf", fillColorLight = "#FFFFFFFF", outlineColor = "#00000000", renderType = RenderType.CHANGE_WEIGHT, @@ -131,7 +129,6 @@ class DefaultClockProvider( timespec = DigitalTimespec.SECOND_DIGIT, style = FontTextStyle( - fontFamily = "google_sans_flex.ttf", lineHeight = 147.25f, fontVariation = "'wght' 603, 'wdth' 100, 'opsz' 144, 'ROND' 100", @@ -140,7 +137,6 @@ class DefaultClockProvider( FontTextStyle( fontVariation = "'wght' 74, 'wdth' 43, 'opsz' 144, 'ROND' 100", - fontFamily = "google_sans_flex.ttf", fillColorLight = "#FFFFFFFF", outlineColor = "#00000000", renderType = RenderType.CHANGE_WEIGHT, @@ -159,7 +155,6 @@ class DefaultClockProvider( timespec = DigitalTimespec.FIRST_DIGIT, style = FontTextStyle( - fontFamily = "google_sans_flex.ttf", lineHeight = 147.25f, fontVariation = "'wght' 603, 'wdth' 100, 'opsz' 144, 'ROND' 100", @@ -168,7 +163,6 @@ class DefaultClockProvider( FontTextStyle( fontVariation = "'wght' 74, 'wdth' 43, 'opsz' 144, 'ROND' 100", - fontFamily = "google_sans_flex.ttf", fillColorLight = "#FFFFFFFF", outlineColor = "#00000000", renderType = RenderType.CHANGE_WEIGHT, @@ -187,7 +181,6 @@ class DefaultClockProvider( timespec = DigitalTimespec.SECOND_DIGIT, style = FontTextStyle( - fontFamily = "google_sans_flex.ttf", lineHeight = 147.25f, fontVariation = "'wght' 603, 'wdth' 100, 'opsz' 144, 'ROND' 100", @@ -196,7 +189,6 @@ class DefaultClockProvider( FontTextStyle( fontVariation = "'wght' 74, 'wdth' 43, 'opsz' 144, 'ROND' 100", - fontFamily = "google_sans_flex.ttf", fillColorLight = "#FFFFFFFF", outlineColor = "#00000000", renderType = RenderType.CHANGE_WEIGHT, @@ -221,13 +213,11 @@ class DefaultClockProvider( timespec = DigitalTimespec.TIME_FULL_FORMAT, style = FontTextStyle( - fontFamily = "google_sans_flex.ttf", fontVariation = "'wght' 600, 'wdth' 100, 'opsz' 144, 'ROND' 100", fontSizeScale = 0.98f, ), aodStyle = FontTextStyle( - fontFamily = "google_sans_flex.ttf", fontVariation = "'wght' 133, 'wdth' 43, 'opsz' 144, 'ROND' 100", fillColorLight = "#FFFFFFFF", outlineColor = "#00000000", |