diff options
| author | John Wang <johnwang@google.com> | 2011-12-20 10:41:08 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-12-20 10:41:08 -0800 |
| commit | c892e177c4f7a41e910c70f68d4e213589da1396 (patch) | |
| tree | 74f5572876d308b05c81ff86cd9213577436face | |
| parent | 1d56f41c9d1dcccf1faef343047375cb14799678 (diff) | |
| parent | 088f1628991cc63401d12ce2e979f0520696693b (diff) | |
| download | base-android-cts-verifier-4.0.3_r1.tar.gz | |
Merge "Hide emergency call text if not support it." into ics-mr1android-cts-verifier-4.0.3_r1
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/KeyguardStatusViewManager.java | 39 |
1 files changed, 27 insertions, 12 deletions
diff --git a/policy/src/com/android/internal/policy/impl/KeyguardStatusViewManager.java b/policy/src/com/android/internal/policy/impl/KeyguardStatusViewManager.java index ee54de1300e3..76d3df00ccb1 100644 --- a/policy/src/com/android/internal/policy/impl/KeyguardStatusViewManager.java +++ b/policy/src/com/android/internal/policy/impl/KeyguardStatusViewManager.java @@ -475,8 +475,9 @@ class KeyguardStatusViewManager implements OnClickListener { break; case NetworkLocked: - carrierText = makeCarierString(mPlmn, - getContext().getText(R.string.lockscreen_network_locked_message)); + carrierText = makeCarrierStringOnEmergencyCapable( + getContext().getText(R.string.lockscreen_network_locked_message), + mPlmn); carrierHelpTextId = R.string.lockscreen_instructions_when_pattern_disabled; break; @@ -485,10 +486,9 @@ class KeyguardStatusViewManager implements OnClickListener { // This depends on mPlmn containing the text "Emergency calls only" when the radio // has some connectivity. Otherwise, it should be null or empty and just show // "No SIM card" - carrierText = getContext().getText(R.string.lockscreen_missing_sim_message_short); - if (mLockPatternUtils.isEmergencyCallCapable()) { - carrierText = makeCarierString(carrierText, mPlmn); - } + carrierText = makeCarrierStringOnEmergencyCapable( + getContext().getText(R.string.lockscreen_missing_sim_message_short), + mPlmn); carrierHelpTextId = R.string.lockscreen_missing_sim_instructions_long; break; @@ -499,21 +499,24 @@ class KeyguardStatusViewManager implements OnClickListener { break; case SimMissingLocked: - carrierText = makeCarierString(mPlmn, - getContext().getText(R.string.lockscreen_missing_sim_message_short)); + carrierText = makeCarrierStringOnEmergencyCapable( + getContext().getText(R.string.lockscreen_missing_sim_message_short), + mPlmn); carrierHelpTextId = R.string.lockscreen_missing_sim_instructions; mEmergencyButtonEnabledBecauseSimLocked = true; break; case SimLocked: - carrierText = makeCarierString(mPlmn, - getContext().getText(R.string.lockscreen_sim_locked_message)); + carrierText = makeCarrierStringOnEmergencyCapable( + getContext().getText(R.string.lockscreen_sim_locked_message), + mPlmn); mEmergencyButtonEnabledBecauseSimLocked = true; break; case SimPukLocked: - carrierText = makeCarierString(mPlmn, - getContext().getText(R.string.lockscreen_sim_puk_locked_message)); + carrierText = makeCarrierStringOnEmergencyCapable( + getContext().getText(R.string.lockscreen_sim_puk_locked_message), + mPlmn); if (!mLockPatternUtils.isPukUnlockScreenEnable()) { // This means we're showing the PUK unlock screen mEmergencyButtonEnabledBecauseSimLocked = true; @@ -526,6 +529,18 @@ class KeyguardStatusViewManager implements OnClickListener { updateEmergencyCallButtonState(mPhoneState); } + + /* + * Add emergencyCallMessage to carrier string only if phone supports emergency calls. + */ + private CharSequence makeCarrierStringOnEmergencyCapable( + CharSequence simMessage, CharSequence emergencyCallMessage) { + if (mLockPatternUtils.isEmergencyCallCapable()) { + return makeCarierString(simMessage, emergencyCallMessage); + } + return simMessage; + } + private View findViewById(int id) { return mContainer.findViewById(id); } |