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

Merge "Hide emergency call text if not support it." into ics-mr1

Browse Source
This commit is contained in:
John Wang
2011-12-20 10:41:08 -08:00
committed by Android (Google) Code Review
parent 1d56f41c9d 088f162899
commit c892e177c4
1 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);
}