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

Commit 4d010401 authored by Bonian Chen's avatar Bonian Chen Committed by Automerger Merge Worker
Browse files

Merge "The text on toast should be changed when remains 1 time for SIM lock input" am: 37a0c387 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1393239

Change-Id: I5b928212912c02f46f2e1d1edcd95cb8b45c5499
parents 9a5a1eab 37a0c387

res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -2955,6 +2955,10 @@ 
        <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>













    <!-- This is instruction text to inform the user that they have entered the wrong SIM PIN while trying to unlock the keyguard.













         The variable will be replaced with a number. [CHAR LIMIT=NONE] -->













    <string name="wrong_pin_code_one">Incorrect SIM PIN code, you have 1 remaining attempt before you must contact your carrier to unlock your device.</string>















    <!-- Instructions telling the user that the operation to unlock the keyguard with SIM PIN failed. Displayed in one line in a large font.  [CHAR LIMIT=40] -->















    <string name="pin_failed">SIM PIN operation failed!</string>















































src/com/android/settings/IccLockSettings.java



+3
−1




























Original line number
Diff line number
Diff line








@@ -674,7 +674,9 @@ public class IccLockSettings extends SettingsPreferenceFragment





























        if (attemptsRemaining == 0) {















            displayMessage = mRes.getString(R.string.wrong_pin_code_pukked);













        } else if (attemptsRemaining > 0) {













        } else if (attemptsRemaining == 1) {













            displayMessage = mRes.getString(R.string.wrong_pin_code_one, attemptsRemaining);













        } else if (attemptsRemaining > 1) {















            displayMessage = mRes















                    .getQuantityString(R.plurals.wrong_pin_code, attemptsRemaining,















                            attemptsRemaining);