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

Commit a400232f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[Status Bar] Fix carrier and userSwitchName text style flaw" into main... 

Merge "[Status Bar] Fix carrier and userSwitchName text style flaw" into main am: 5ee2adb1 am: 790e281f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3184760



Change-Id: Id668f50350f49127f7b15b16f248f78b9097c508
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5f5abbfe 790e281f

packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java

+4 −3
Original line number Original line Diff line number Diff line
@@ -435,13 +435,14 @@ public class KeyguardStatusBarView extends RelativeLayout { 




    /** Should only be called from {@link KeyguardStatusBarViewController}. */

    /** Should only be called from {@link KeyguardStatusBarViewController}. */

    void onOverlayChanged() {

    void onOverlayChanged() {

        int theme = Utils.getThemeAttr(mContext, com.android.internal.R.attr.textAppearanceSmall);

        final int carrierTheme = R.style.TextAppearance_StatusBar_Clock;

        mCarrierLabel.setTextAppearance(theme);

        mCarrierLabel.setTextAppearance(carrierTheme);

        mBatteryView.updatePercentView();

        mBatteryView.updatePercentView();





        final int userSwitcherTheme = R.style.TextAppearance_StatusBar_UserChip;

        TextView userSwitcherName = mUserSwitcherContainer.findViewById(R.id.current_user_name);

        TextView userSwitcherName = mUserSwitcherContainer.findViewById(R.id.current_user_name);

        if (userSwitcherName != null) {

        if (userSwitcherName != null) {

            userSwitcherName.setTextAppearance(theme);

            userSwitcherName.setTextAppearance(userSwitcherTheme);

        }

        }

    }

    }