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

Commit d234822a authored by Danny Baumann's avatar Danny Baumann Committed by Michael Bestas
Browse files

Revert "SystemUI: Add SlotId for MultiSim" 

Causes format string parameter mismatches with non-English locales.

This reverts commit 0aae1f69.

Change-Id: I0422de74fad5acdac5a0201430d551fb4cf7cbc6
parent 527e2073

packages/Keyguard/res/values/strings.xml

100755 → 100644
+4 −4
Original line number Diff line number Diff line
@@ -269,8 +269,8 @@ 
    <!-- Instructions telling the user that they entered the wrong SIM PIN while trying

         to unlock the keyguard.  Displayed in a dialog box.  -->

    <plurals name="kg_password_wrong_pin_code">

        <item quantity="one">Incorrect SIM<xliff:g id="slotid">%d</xliff:g> PIN code, you have <xliff:g id="number">%d</xliff:g> remaining attempt before you must contact your carrier to unlock your device.</item>

        <item quantity="other">Incorrect SIM<xliff:g id="slotid">%d</xliff:g> PIN code, you have <xliff:g id="number">%d</xliff:g> remaining attempts.</item>

        <item quantity="one">Incorrect SIM PIN code, you have <xliff:g id="number">%d</xliff:g> remaining attempt before you must contact your carrier to unlock your device.</item>

        <item quantity="other">Incorrect SIM PIN code, you have <xliff:g id="number">%d</xliff:g> remaining attempts.</item>

    </plurals>



    <!-- Instructions telling the user that they have exhausted SIM PUK retries and the SIM is now unusable.
@@ -376,9 +376,9 @@ 


    <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->

    <plurals name="kg_password_default_pin_message">

        <item quantity="one">Enter SIM<xliff:g id="slotid">%d</xliff:g> PIN, you have <xliff:g id="number">%d</xliff:g> remaining

        <item quantity="one">Enter SIM PIN, you have <xliff:g id="number">%d</xliff:g> remaining

attempt before you must contact your carrier to unlock your device.</item>

        <item quantity="other">Enter SIM<xliff:g id="slotid">%d</xliff:g> PIN, you have <xliff:g id="number">%d</xliff:g> remaining

        <item quantity="other">Enter SIM PIN, you have <xliff:g id="number">%d</xliff:g> remaining

attempts.</item>

    </plurals>

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

100755 → 100644
+1 −3
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ public class KeyguardSimPinView extends KeyguardPinBasedInputView { 
    private int mResult = PhoneConstants.PIN_PASSWORD_INCORRECT;

    private AlertDialog mRemainingAttemptsDialog;

    private int mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;

    private int mSlotId;

    private ImageView mSimImageView;



    KeyguardUpdateMonitorCallback mUpdateMonitorCallback = new KeyguardUpdateMonitorCallback() {
@@ -115,7 +114,7 @@ public class KeyguardSimPinView extends KeyguardPinBasedInputView { 
            msgId = isDefault ? R.plurals.kg_password_default_pin_message :

                     R.plurals.kg_password_wrong_pin_code;

            displayMessage = getContext().getResources()

                    .getQuantityString(msgId, attemptsRemaining, mSlotId, attemptsRemaining);

                    .getQuantityString(msgId, attemptsRemaining, attemptsRemaining);

        } else {

            msgId = isDefault ? R.string.kg_sim_pin_instructions : R.string.kg_password_pin_failed;

            displayMessage = getContext().getString(msgId);
@@ -338,7 +337,6 @@ public class KeyguardSimPinView extends KeyguardPinBasedInputView { 
            mSecurityMessageDisplay.setMessage(R.string.kg_sim_pin_instructions, true);

        }



        mSlotId = SubscriptionManager.getSlotId(mSubId) + 1;

        int count = TelephonyManager.getDefault().getSimCount();

        Resources rez = getResources();

        final String msg;