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

Commit 8e01404a authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Telephony (MSIM): Change the code to use @bool/kg_use_all_caps."

parents 9bb4c19e 31f63628

packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java

+0 −1
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ public class KeyguardViewManager { 
    private final static boolean DEBUG = KeyguardViewMediator.DEBUG;

    private static String TAG = "KeyguardViewManager";

    public final static String IS_SWITCHING_USER = "is_switching_user";

    public static boolean USE_UPPER_CASE = true;



    // Delay dismissing keyguard to allow animations to complete.

    private static final int HIDE_KEYGUARD_DELAY = 500;

packages/Keyguard/src/com/android/keyguard/msim/MSimCarrierText.java

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ public class MSimCarrierText extends CarrierText { 
        CharSequence text = "";

        for (int i = 0; i < simState.length; i++) {

            CharSequence displayText = getCarrierTextForSimState(simState[i], plmn[i], spn[i]);

            if (KeyguardViewManager.USE_UPPER_CASE) {

            if (mContext.getResources().getBoolean(R.bool.kg_use_all_caps)) {

                displayText = (displayText != null ? displayText.toString().toUpperCase() : "");

            }

            text = (TextUtils.isEmpty(text)