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

Commit fc480596 authored by Dhina17's avatar Dhina17
Browse files

SystemUI: Update QS header fields text appearance on theme change 

Now it's showing correct font for QS header clock, date and carrier text
after changing system font.

Change-Id: I75d7a065e93e17ebba01aa9cbe705ac6ab5a781d
parent 07f55640

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

+6 −0
Original line number Diff line number Diff line
@@ -288,6 +288,12 @@ constructor( 
                updateCarrierGroupPadding()

                clock.onDensityOrFontScaleChanged()

            }



            override fun onThemeChanged() {

                clock.setTextAppearance(R.style.TextAppearance_QS_Status)

                date.setTextAppearance(R.style.TextAppearance_QS_Status)

                mShadeCarrierGroup.updateTextAppearance(R.style.TextAppearance_QS_Status_Carriers)

            }

        }



    private val nextAlarmCallback =

packages/SystemUI/src/com/android/systemui/shade/carrier/ShadeCarrier.java

+4 −2
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ import androidx.annotation.VisibleForTesting; 


import com.android.settingslib.Utils;

import com.android.settingslib.graph.SignalDrawable;

import com.android.systemui.FontSizeUtils;

import com.android.systemui.res.R;

import com.android.systemui.statusbar.pipeline.mobile.ui.view.ModernShadeCarrierGroupMobileView;

import com.android.systemui.util.LargeScreenUtils;
@@ -162,7 +161,10 @@ public class ShadeCarrier extends LinearLayout { 
    }



    public void updateTextAppearance(@StyleRes int resId) {

        FontSizeUtils.updateFontSizeFromStyle(mCarrierText, resId);

        mCarrierText.setTextAppearance(resId);

        if (mModernMobileView != null) {

            mModernMobileView.updateTextAppearance(resId);

        }

    }



    @Override

packages/SystemUI/src/com/android/systemui/shade/carrier/ShadeCarrierGroup.java

+1 −2
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.view.View; 
import android.widget.LinearLayout;

import android.widget.TextView;



import com.android.systemui.FontSizeUtils;

import com.android.systemui.res.R;



/**
@@ -59,7 +58,7 @@ public class ShadeCarrierGroup extends LinearLayout { 
    }



    public void updateTextAppearance(@StyleRes int resId) {

        FontSizeUtils.updateFontSizeFromStyle(getNoSimTextView(), resId);

        getNoSimTextView().setTextAppearance(resId);

        getCarrier1View().updateTextAppearance(resId);

        getCarrier2View().updateTextAppearance(resId);

        getCarrier3View().updateTextAppearance(resId);

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/view/ModernShadeCarrierGroupMobileView.kt

+4 −0
Original line number Diff line number Diff line
@@ -45,6 +45,10 @@ class ModernShadeCarrierGroupMobileView( 
            "viewString=${super.toString()}"

    }



    fun updateTextAppearance(resId: Int) {

        requireViewById<AutoMarqueeTextView>(R.id.mobile_carrier_text).setTextAppearance(resId)

    }



    companion object {



        /**