Bring back the MDN (phone number) status even if there's no voice.

Needed for carrier customer support purposes.

Bug: 3351493

Change "My phone number" string to "MDN".

Change-Id: Icee0f97348034a9fb7f79a3c48868d5f74edabb1
This commit is contained in:
Amith Yamasani
2011-01-24 08:56:07 -08:00
parent 22c060ebd1
commit b409b904d6
2 changed files with 10 additions and 13 deletions

View File

@@ -1430,8 +1430,10 @@
<string name="status_imei">IMEI</string> <string name="status_imei">IMEI</string>
<!-- Do not translate. About phone, status item title --> <!-- Do not translate. About phone, status item title -->
<string name="status_imei_sv">IMEI SV</string> <string name="status_imei_sv">IMEI SV</string>
<!-- About phone, status item title. The phone number of the current device.--> <!-- About tablet, status item title. The Mobile Directory Number [CHAR LIMIT=30] -->
<string name="status_number">My phone number</string> <string name="status_number" product="tablet">MDN</string>
<!-- About phone, status item title. The phone number of the current device [CHAR LIMIT=30] -->
<string name="status_number" product="default">My phone number</string>
<!-- About phone, status item title. The phone MIN number of the current device.--> <!-- About phone, status item title. The phone MIN number of the current device.-->
<string name="status_min_number">MIN</string> <string name="status_min_number">MIN</string>
<!-- About phone, status item title. The phone PRL Version of the current device.--> <!-- About phone, status item title. The phone PRL Version of the current device.-->

View File

@@ -222,18 +222,13 @@ public class Status extends PreferenceActivity {
removePreferenceFromScreen(KEY_MIN_NUMBER); removePreferenceFromScreen(KEY_MIN_NUMBER);
} }
// Remove the phone number preference if the device is not voice capable. String rawNumber = mPhone.getLine1Number(); // may be null or empty
if (!Utils.isVoiceCapable(this)) { String formattedNumber = null;
removePreferenceFromScreen(KEY_PHONE_NUMBER); if (!TextUtils.isEmpty(rawNumber)) {
} else { formattedNumber = PhoneNumberUtils.formatNumber(rawNumber);
String rawNumber = mPhone.getLine1Number(); // may be null or empty
String formattedNumber = null;
if (!TextUtils.isEmpty(rawNumber)) {
formattedNumber = PhoneNumberUtils.formatNumber(rawNumber);
}
// If formattedNumber is null or empty, it'll display as "Unknown".
setSummaryText(KEY_PHONE_NUMBER, formattedNumber);
} }
// If formattedNumber is null or empty, it'll display as "Unknown".
setSummaryText(KEY_PHONE_NUMBER, formattedNumber);
mPhoneStateReceiver = new PhoneStateIntentReceiver(this, mHandler); mPhoneStateReceiver = new PhoneStateIntentReceiver(this, mHandler);
mPhoneStateReceiver.notifySignalStrength(EVENT_SIGNAL_STRENGTH_CHANGED); mPhoneStateReceiver.notifySignalStrength(EVENT_SIGNAL_STRENGTH_CHANGED);