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

Commit 25dbd2d1 authored by John Wang's avatar John Wang Committed by Android Git Automerger
Browse files

am 3e1c4bd8: am 22930da7: Merge "Add unusable SIM message." into jb-dev 

* commit '3e1c4bd8':
  Add unusable SIM message.
parents 78cd30ef 3e1c4bd8

core/res/res/values/public.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -1316,6 +1316,7 @@ 
  <java-symbol type="string" name="lockscreen_password_wrong" />

  <java-symbol type="string" name="lockscreen_password_wrong" />

  <java-symbol type="string" name="lockscreen_pattern_instructions" />

  <java-symbol type="string" name="lockscreen_pattern_instructions" />

  <java-symbol type="string" name="lockscreen_pattern_wrong" />

  <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_permanent_disabled_sim_instructions" />

  <java-symbol type="string" name="lockscreen_plugged_in" />

  <java-symbol type="string" name="lockscreen_plugged_in" />

  <java-symbol type="string" name="lockscreen_sim_locked_message" />

  <java-symbol type="string" name="lockscreen_sim_locked_message" />

core/res/res/values/strings.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -1898,6 +1898,8 @@ 
    <string name="lockscreen_missing_sim_instructions">Insert a SIM card.</string>

    <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. -->

    <!-- 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>

    <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. -->

    <!-- 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

    <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>

    Contact your wireless service provider for another SIM card.</string>

policy/src/com/android/internal/policy/impl/KeyguardStatusViewManager.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -509,7 +509,8 @@ class KeyguardStatusViewManager implements OnClickListener { 
                break;

                break;





            case SimPermDisabled:

            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;

                carrierHelpTextId = R.string.lockscreen_permanent_disabled_sim_instructions;

                mEmergencyButtonEnabledBecauseSimLocked = true;

                mEmergencyButtonEnabledBecauseSimLocked = true;

                break;

                break;