diff options
| author | Jim Miller <jaggies@google.com> | 2014-11-12 19:29:51 -0800 |
|---|---|---|
| committer | Jorim Jaggi <jjaggi@google.com> | 2014-11-20 21:36:52 +0100 |
| commit | 52a6133f4ba8b1d08f5158d802790d6a1b16568d (patch) | |
| tree | 80e4cf7088f82703f021a3b8b1ecc9861189b568 /packages/Keyguard/res/values | |
| parent | 419754545ea0768a7fa715daddedef75b7b31bfa (diff) | |
| download | frameworks_base-52a6133f4ba8b1d08f5158d802790d6a1b16568d.zip frameworks_base-52a6133f4ba8b1d08f5158d802790d6a1b16568d.tar.gz frameworks_base-52a6133f4ba8b1d08f5158d802790d6a1b16568d.tar.bz2 | |
Add multi-sim support to keyguard
Use new telephony APIs.
Clean up SIM state machine code.
Use cached copy of SubscriptionInfo.
Make SIM PIN and SIM PUK work.
Tested on single and multi-SIM devices.
Fixes bug 18147652
Change-Id: Ic69a4d2898999a5438e6a70b5851705bc05443f1
Diffstat (limited to 'packages/Keyguard/res/values')
| -rw-r--r-- | packages/Keyguard/res/values/strings.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/packages/Keyguard/res/values/strings.xml b/packages/Keyguard/res/values/strings.xml index a136acf..fbe3712 100644 --- a/packages/Keyguard/res/values/strings.xml +++ b/packages/Keyguard/res/values/strings.xml @@ -240,12 +240,16 @@ <string name="kg_pattern_instructions">Draw your pattern</string> <!-- Instructions for using the SIM PIN unlock screen --> <string name="kg_sim_pin_instructions">Enter SIM PIN</string> + <!-- Instructions for using the SIM PIN unlock screen when there's more than one SIM --> + <string name="kg_sim_pin_instructions_multi">Enter SIM PIN for \"<xliff:g id="carrier" example="CARD 1">%1$s</xliff:g>\"</string> <!-- Instructions for using the PIN unlock screen --> <string name="kg_pin_instructions">Enter PIN</string> <!-- Instructions for using the password unlock screen --> <string name="kg_password_instructions">Enter Password</string> <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider --> <string name="kg_puk_enter_puk_hint">SIM is now disabled. Enter PUK code to continue. Contact carrier for details.</string> + <!-- Hint shown when there are multiple SIMs in the device to ask the user to enter the PUK code given to them by their provider --> + <string name="kg_puk_enter_puk_hint_multi">SIM \"<xliff:g id="carrier" example="CARD 1">%1$s</xliff:g>\" is now disabled. Enter PUK code to continue. Contact carrier for details.</string> <!-- Hint shown in the PUK unlock screen PIN TextView --> <string name="kg_puk_enter_pin_hint">Enter desired PIN code</string> <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen --> |