diff --git a/packages/SystemUI/res-keyguard/values/strings.xml b/packages/SystemUI/res-keyguard/values/strings.xml index 09a5295b55ef9..9b47e1436ede0 100644 --- a/packages/SystemUI/res-keyguard/values/strings.xml +++ b/packages/SystemUI/res-keyguard/values/strings.xml @@ -112,6 +112,8 @@ whether it is valid, and to unlock the sim if it is valid. we display a progress dialog in the meantime. this is the emssage. --> Unlocking SIM card\u2026 + + %s (%s) h:mm diff --git a/packages/SystemUI/src/com/android/keyguard/CarrierTextController.java b/packages/SystemUI/src/com/android/keyguard/CarrierTextController.java index c407ba8abf225..209074812d7a0 100644 --- a/packages/SystemUI/src/com/android/keyguard/CarrierTextController.java +++ b/packages/SystemUI/src/com/android/keyguard/CarrierTextController.java @@ -481,13 +481,13 @@ public class CarrierTextController { break; case SimLocked: - carrierText = makeCarrierStringOnEmergencyCapable( + carrierText = makeCarrierStringOnLocked( getContext().getText(R.string.keyguard_sim_locked_message), text); break; case SimPukLocked: - carrierText = makeCarrierStringOnEmergencyCapable( + carrierText = makeCarrierStringOnLocked( getContext().getText(R.string.keyguard_sim_puk_locked_message), text); break; @@ -515,6 +515,26 @@ public class CarrierTextController { return simMessage; } + /* + * Add "SIM card is locked" in parenthesis after carrier name, so it is easily associated in + * DSDS + */ + private CharSequence makeCarrierStringOnLocked(CharSequence simMessage, + CharSequence carrierName) { + final boolean simMessageValid = !TextUtils.isEmpty(simMessage); + final boolean carrierNameValid = !TextUtils.isEmpty(carrierName); + if (simMessageValid && carrierNameValid) { + return mContext.getString(R.string.keyguard_carrier_name_with_sim_locked_template, + carrierName, simMessage); + } else if (simMessageValid) { + return simMessage; + } else if (carrierNameValid) { + return carrierName; + } else { + return ""; + } + } + /** * Determine the current status of the lock screen given the SIM state and other stuff. */