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

Commit 6c769a70 authored by Marcos Marado's avatar Marcos Marado Committed by Gerrit Code Review
Browse files

keyguard: SIM Display Name is now a config 

In devices with more than one SIM, keyguard visually distinguishes each SIM
card by showing its color and its name.

This patch introduces now a configuration item that lets you choose wether or
not show the SIM display name on those cases.

Issue: PAELLA-224
Change-Id: I8fb019d4fa534b2ca2f047083c27aa9cf8b7b39c
parent 03ea3114

packages/Keyguard/res/values/bools.xml

+1 −0
Original line number Diff line number Diff line
@@ -17,4 +17,5 @@ 
<resources>

    <bool name="kg_show_ime_at_screen_on">true</bool>

    <bool name="kg_use_all_caps">true</bool>

    <bool name="kg_sim_display_name">true</bool>

</resources>

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

+6 −2
Original line number Diff line number Diff line
@@ -328,8 +328,12 @@ public class KeyguardSimPinView extends KeyguardPinBasedInputView { 
            msg = rez.getString(R.string.kg_sim_pin_instructions);

        } else {

            SubscriptionInfo info = monitor.getSubscriptionInfoForSubId(mSubId);

            if (rez.getBoolean(R.bool.kg_sim_display_name)) {

                CharSequence displayName = info != null ? info.getDisplayName() : ""; // don't crash

                msg = rez.getString(R.string.kg_sim_pin_instructions_multi, displayName);

            } else {

                msg = rez.getString(R.string.kg_sim_pin_instructions);

            }

            if (info != null) {

                color = info.getIconTint();

            }