Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add unusable SIM message." into jb-dev

Browse Source
This commit is contained in:
John Wang
2012-05-02 17:37:44 -07:00
committed by Android (Google) Code Review
parent 3421f9fd68 82b2cd0fe9
commit 22930da77f
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/res/res/values/public.xml
View File

@@ -1316,6 +1316,7 @@
<java-symbol type="string" name="lockscreen_password_wrong" />
<java-symbol type="string" name="lockscreen_pattern_instructions" />
<java-symbol type="string" name="lockscreen_pattern_wrong" />
<java-symbol type="string" name="lockscreen_permanent_disabled_sim_message_short" />
<java-symbol type="string" name="lockscreen_permanent_disabled_sim_instructions" />
<java-symbol type="string" name="lockscreen_plugged_in" />
<java-symbol type="string" name="lockscreen_sim_locked_message" />

2
core/res/res/values/strings.xml
View File

@@ -1898,6 +1898,8 @@
<string name="lockscreen_missing_sim_instructions">Insert a SIM card.</string>
<!-- Shown in the lock screen to ask the user to insert a SIM card when sim is missing or not readable. -->
<string name="lockscreen_missing_sim_instructions_long">The SIM card is missing or not readable. Insert a SIM card.</string>
<!-- Shown in the lock screen when SIM card is permanently disabled. -->
<string name="lockscreen_permanent_disabled_sim_message_short">Unusable SIM card.</string>
<!-- Shown in the lock screen to inform the user to SIM card is permanently disabled. -->
<string name="lockscreen_permanent_disabled_sim_instructions">Your SIM card has been permanently disabled.\n
Contact your wireless service provider for another SIM card.</string>

3
policy/src/com/android/internal/policy/impl/KeyguardStatusViewManager.java
View File

@@ -509,7 +509,8 @@ class KeyguardStatusViewManager implements OnClickListener {
break;
case SimPermDisabled:
carrierText = getContext().getText(R.string.lockscreen_missing_sim_message_short);
carrierText = getContext().getText(
R.string.lockscreen_permanent_disabled_sim_message_short);
carrierHelpTextId = R.string.lockscreen_permanent_disabled_sim_instructions;
mEmergencyButtonEnabledBecauseSimLocked = true;
break;