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

Commit b7310022 authored by Hawkwood Glazier's avatar Hawkwood Glazier
Browse files

Prevent Typeface recreation for default flex clock 

Bug: 378217740
Test: Manually took some traces
Flag: com.android.systemui.clock_reactive_variants
Change-Id: I6620aaff77b1e8b80f2426255882ca96c94c04f7
parent df5c89ca

packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockProvider.kt

+6 −5
Original line number Diff line number Diff line
@@ -67,11 +67,7 @@ class DefaultClockProvider( 
            val buffers = messageBuffers ?: ClockMessageBuffers(LogUtil.DEFAULT_MESSAGE_BUFFER)

            val fontAxes = ClockFontAxis.merge(FlexClockController.FONT_AXES, settings.axes)

            val clockSettings = settings.copy(axes = fontAxes.map { it.toSetting() })

            val typefaceCache =

                TypefaceCache(buffers.infraMessageBuffer) {

                    // TODO(b/364680873): Move constant to config_clockFontFamily when shipping

                    return@TypefaceCache Typeface.create("google-sans-flex-clock", Typeface.NORMAL)

                }

            val typefaceCache = TypefaceCache(buffers.infraMessageBuffer) { FLEX_TYPEFACE }

            FlexClockController(

                ClockContext(

                    ctx,
@@ -131,6 +127,11 @@ class DefaultClockProvider( 
                ClockFontAxisSetting("slnt", 0f),

            )



        val FLEX_TYPEFACE by lazy {

            // TODO(b/364680873): Move constant to config_clockFontFamily when shipping

            Typeface.create("google-sans-flex-clock", Typeface.NORMAL)

        }



        val FLEX_DESIGN = run {

            val largeLayer =

                listOf(