SystemUI: Match lockscreen clock font with system

Signed-off-by: Pranav Vashi <[email protected]> Signed-off-by: DennySPb <[email protected]>
syberia-project · Dec 19, 2022 · 366b3c9 · 366b3c9
1 parent 1078567
commit 366b3c9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/clocks/DefaultClockProvider.kt b/packages/SystemUI/shared/src/com/android/systemui/shared/clocks/DefaultClockProvider.kt
@@ -16,6 +16,7 @@ package com.android.systemui.shared.clocks
 import android.content.Context
 import android.content.res.Resources
 import android.graphics.Color
+import android.graphics.Typeface
 import android.graphics.drawable.Drawable
 import android.icu.text.NumberFormat
 import android.util.TypedValue
@@ -135,10 +136,18 @@ class DefaultClock(
             clocks.forEach { it.onTimeZoneChanged(timeZone) }
 
         override fun onFontSettingChanged() {
+            smallClock.setTypeface(
+                Typeface.create(
+                resources.getString(com.android.internal.R.string.config_headlineFontFamily), Typeface.NORMAL)
+            )
             smallClock.setTextSize(
                 TypedValue.COMPLEX_UNIT_PX,
                 resources.getDimensionPixelSize(R.dimen.small_clock_text_size).toFloat()
             )
+            largeClock.setTypeface(
+                Typeface.create(
+                resources.getString(com.android.internal.R.string.config_headlineFontFamily), Typeface.NORMAL)
+            )
             largeClock.setTextSize(
                 TypedValue.COMPLEX_UNIT_PX,
                 resources.getDimensionPixelSize(R.dimen.large_clock_text_size).toFloat()

diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java
@@ -203,6 +203,11 @@ public void onLocaleListChanged() {
         public void onDensityOrFontScaleChanged() {
             mKeyguardClockSwitchController.onDensityOrFontScaleChanged();
         }
+
+        @Override
+        public void onThemeChanged() {
+            mKeyguardClockSwitchController.onDensityOrFontScaleChanged();
+        }
     };
 
     private KeyguardUpdateMonitorCallback mInfoCallback = new KeyguardUpdateMonitorCallback() {