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

Commit 198c0c89 authored by Justin Weir's avatar Justin Weir Committed by Android (Google) Code Review
Browse files

Merge "Make carrier text update on theme change" into main

parents 36f40836 b3537215

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

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




import com.android.settingslib.Utils;

import com.android.settingslib.Utils;

import com.android.settingslib.graph.SignalDrawable;

import com.android.settingslib.graph.SignalDrawable;

import com.android.systemui.FontSizeUtils;

import com.android.systemui.res.R;

import com.android.systemui.res.R;

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

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

import com.android.systemui.util.LargeScreenUtils;

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

    }





    public void updateTextAppearance(@StyleRes int resId) {

    public void updateTextAppearance(@StyleRes int resId) {

        FontSizeUtils.updateFontSizeFromStyle(mCarrierText, resId);

        mCarrierText.setTextAppearance(resId);

    }

    }





    @Override

    @Override

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

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

import android.widget.LinearLayout;

import android.widget.TextView;

import android.widget.TextView;





import com.android.systemui.FontSizeUtils;

import com.android.systemui.res.R;

import com.android.systemui.res.R;





/**

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

    }





    public void updateTextAppearance(@StyleRes int resId) {

    public void updateTextAppearance(@StyleRes int resId) {

        FontSizeUtils.updateFontSizeFromStyle(getNoSimTextView(), resId);

        getNoSimTextView().setTextAppearance(resId);

        getCarrier1View().updateTextAppearance(resId);

        getCarrier1View().updateTextAppearance(resId);

        getCarrier2View().updateTextAppearance(resId);

        getCarrier2View().updateTextAppearance(resId);

        getCarrier3View().updateTextAppearance(resId);

        getCarrier3View().updateTextAppearance(resId);