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

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

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

* commit 'c892e177':
  Hide emergency call text if not support it.
parents c296892a c892e177
Loading
Loading
Loading
Loading
+27 −12
Original line number Diff line number Diff line
@@ -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);
    }