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

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

Merge "Make time and date up date font colors update on theme change" into main

parents 61183b30 27d23a7e

packages/SystemUI/res/values/styles.xml

+2 −1
Original line number Diff line number Diff line
@@ -184,7 +184,8 @@ 
    <style name="TextAppearance.QS.Status">

        <item name="android:fontFamily" android:featureFlag="!com.android.systemui.shade_header_font_update">@*android:string/config_headlineFontFamily</item>

        <item name="android:fontFamily" android:featureFlag="com.android.systemui.shade_header_font_update">variable-body-medium-emphasized</item>

        <item name="android:textColor">@color/shade_header_text_color</item>

        <item name="android:textColor" android:featureFlag="!com.android.systemui.shade_header_font_update">@color/shade_header_text_color</item>

        <item name="android:textColor" android:featureFlag="com.android.systemui.shade_header_font_update">@androidprv:color/materialColorOnSurface</item>

        <item name="android:textSize">14sp</item>

        <item name="android:letterSpacing">0.01</item>

    </style>

packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt

+14 −0
Original line number Diff line number Diff line
@@ -334,6 +334,14 @@ constructor( 
                updateCarrierGroupPadding()

                clock.onDensityOrFontScaleChanged()

            }



            override fun onThemeChanged() {

                updateColors()

            }



            override fun onUiModeChanged() {

                updateColors()

            }

        }



    private val nextAlarmCallback =
@@ -498,6 +506,12 @@ constructor( 
            .load(context, resources.getXml(R.xml.large_screen_shade_header))

    }



    private fun updateColors() {

        clock.setTextAppearance(R.style.TextAppearance_QS_Status)

        date.setTextAppearance(R.style.TextAppearance_QS_Status)

        mShadeCarrierGroup.updateTextAppearance(R.style.TextAppearance_QS_Status)

    }



    private fun updateCarrierGroupPadding() {

        clock.doOnLayout {

            val maxClockWidth =

packages/SystemUI/tests/src/com/android/systemui/shade/ShadeHeaderControllerTest.kt

+16 −0
Original line number Diff line number Diff line
@@ -308,6 +308,22 @@ class ShadeHeaderControllerTest : SysuiTestCase() { 
        verify(carrierGroup).updateTextAppearance(R.style.TextAppearance_QS_Status)

    }



    @Test

    fun updateUiMode_changesFontStyle() {

        configurationController.notifyUiModeChanged()



        verify(clock).setTextAppearance(R.style.TextAppearance_QS_Status)

        verify(date).setTextAppearance(R.style.TextAppearance_QS_Status)

    }



    @Test

    fun updateTheme_changesFontStyle() {

        configurationController.notifyThemeChanged()



        verify(clock).setTextAppearance(R.style.TextAppearance_QS_Status)

        verify(date).setTextAppearance(R.style.TextAppearance_QS_Status)

    }



    @Test

    fun animateOutOnStartCustomizing() {

        val animator = mock(ViewPropertyAnimator::class.java, Answers.RETURNS_SELF)

packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/policy/FakeConfigurationController.kt

+4 −0
Original line number Diff line number Diff line
@@ -35,6 +35,10 @@ class FakeConfigurationController @Inject constructor() : 
        listeners.forEach { it.onThemeChanged() }

    }



    fun notifyUiModeChanged() {

        listeners.forEach { it.onUiModeChanged() }

    }



    fun notifyDensityOrFontScaleChanged() {

        listeners.forEach { it.onDensityOrFontScaleChanged() }

    }