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

Commit b3537215 authored by Justin Weir's avatar Justin Weir
Browse files

Make carrier text update on theme change 

Previously, the colors did not update because the background was
a fixed black. Now that background blur is enabled, the font color
needs to update with the theme/mode like the QS tile fonts.

Bug: 405266952
Flag: com.android.systemui.shade_header_font_update
Test: ran affected tests; manually verified
Change-Id: I4b266d5ca3ca440818ef951b6868e35cb2cb4865
parent d4130fbc

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

+1 −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,7 @@ public class ShadeCarrier extends LinearLayout { 
    }



    public void updateTextAppearance(@StyleRes int resId) {

        FontSizeUtils.updateFontSizeFromStyle(mCarrierText, resId);

        mCarrierText.setTextAppearance(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);