From b409b904d603f53bad0700555569875e61fc5231 Mon Sep 17 00:00:00 2001
From: Amith Yamasani <yamasani@google.com>
Date: Mon, 24 Jan 2011 08:56:07 -0800
Subject: [PATCH] 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
---
 res/values/strings.xml                          |  6 ++++--
 src/com/android/settings/deviceinfo/Status.java | 17 ++++++-----------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9724e6088c2..319fb48caee 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1430,8 +1430,10 @@
     <string name="status_imei">IMEI</string>
     <!-- Do not translate. About phone, status item title -->
     <string name="status_imei_sv">IMEI SV</string>
-    <!-- About phone, status item title.  The phone number of the current device.-->
-    <string name="status_number">My phone number</string>
+    <!-- About tablet, status item title.  The Mobile Directory Number [CHAR LIMIT=30] -->
+    <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.-->
     <string name="status_min_number">MIN</string>
     <!-- About phone, status item title.  The phone PRL Version of the current device.-->
diff --git a/src/com/android/settings/deviceinfo/Status.java b/src/com/android/settings/deviceinfo/Status.java
index e443c1d2902..f171c81d95f 100644
--- a/src/com/android/settings/deviceinfo/Status.java
+++ b/src/com/android/settings/deviceinfo/Status.java
@@ -222,18 +222,13 @@ public class Status extends PreferenceActivity {
             removePreferenceFromScreen(KEY_MIN_NUMBER);
         }
 
-        // Remove the phone number preference if the device is not voice capable.
-        if (!Utils.isVoiceCapable(this)) {
-            removePreferenceFromScreen(KEY_PHONE_NUMBER);
-        } else {
-            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);
+        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);
 
         mPhoneStateReceiver = new PhoneStateIntentReceiver(this, mHandler);
         mPhoneStateReceiver.notifySignalStrength(EVENT_SIGNAL_STRENGTH_CHANGED);