Display IMEI and ICCID for LTE device.

Display IMEI nad ICCID in About tablet / Status for LTE devices.

bug:4983512
bug:5001888
Change-Id: I4c418b159b49bef96acd5ef300c9b71379821d1b

res/values/strings.xml

@@ -1550,8 +1550,10 @@
     <string name="status_min_number">MIN</string>
     <!-- About phone, status item title.  The phone PRL Version of the current device.-->
     <string name="status_prl_version">PRL Version</string>
-    <!-- About phone, status item title.  The phone IMEI/MEID number of the current LTE/CDMA device.-->
+    <!-- About phone, status item title.  The phone MEID number of the current LTE/CDMA device. [CHAR LIMIT=30] -->
-    <string name="status_meid_number">IMEI / MEID</string>
+    <string name="status_meid_number">MEID</string>
+    <!-- About phone, status item title.  The ICCID of the current LTE device. [CHAR LIMIT=30] -->
+    <string name="status_icc_id">ICCID</string>
     <!-- About phone, status item title for the type of data phone network we're connected to, for example 3G or Edge or GPRS -->
     <string name="status_network_type">Mobile network type</string>
     <!-- About phone, status item title. The status of data access.  For example, the value may be "Connected" -->

res/xml/device_info_status.xml

@@ -27,29 +27,6 @@
         android:title="@string/battery_level_title"
         android:summary="@string/device_info_not_available"
         android:persistent="false" />
-    <Preference android:key="number" 
-        style="?android:attr/preferenceInformationStyle" 
-        android:title="@string/status_number"
-        android:summary="@string/device_info_not_available"
-        android:persistent="false" />
-    <!-- This menu item is only for CDMA phone -->
-    <Preference android:key="min_number"
-        style="?android:attr/preferenceInformationStyle"
-        android:title="@string/status_min_number"
-        android:summary="@string/device_info_not_available"
-        android:persistent="false" />
-    <!-- This menu item is only for CDMA phone -->
-    <Preference android:key="prl_version"
-        style="?android:attr/preferenceInformationStyle"
-        android:title="@string/status_prl_version"
-        android:summary="@string/device_info_not_available"
-        android:persistent="false" />
-    <!-- This menu item is only for CDMA phone -->
-    <Preference android:key="meid_number"
-        style="?android:attr/preferenceInformationStyle"
-        android:title="@string/status_meid_number"
-        android:summary="@string/device_info_not_available"
-        android:persistent="false" />
     <Preference android:key="operator_name"
         style="?android:attr/preferenceInformationStyle"
         android:title="@string/status_operator"
@@ -80,6 +57,29 @@
         android:title="@string/status_data_state"
         android:summary="@string/device_info_not_available"
         android:persistent="false" />
+    <Preference android:key="number"
+        style="?android:attr/preferenceInformationStyle"
+        android:title="@string/status_number"
+        android:summary="@string/device_info_not_available"
+        android:persistent="false" />
+    <!-- This menu item is only for CDMA phone -->
+    <Preference android:key="min_number"
+        style="?android:attr/preferenceInformationStyle"
+        android:title="@string/status_min_number"
+        android:summary="@string/device_info_not_available"
+        android:persistent="false" />
+    <!-- This menu item is only for CDMA phone -->
+    <Preference android:key="prl_version"
+        style="?android:attr/preferenceInformationStyle"
+        android:title="@string/status_prl_version"
+        android:summary="@string/device_info_not_available"
+        android:persistent="false" />
+    <!-- This menu item is only for CDMA phone -->
+    <Preference android:key="meid_number"
+        style="?android:attr/preferenceInformationStyle"
+        android:title="@string/status_meid_number"
+        android:summary="@string/device_info_not_available"
+        android:persistent="false" />
     <Preference android:key="imei"
         style="?android:attr/preferenceInformationStyle"
         android:title="@string/status_imei"
@@ -90,6 +90,11 @@
         android:title="@string/status_imei_sv"
         android:summary="@string/device_info_not_available"
         android:persistent="false" />
+    <Preference android:key="icc_id"
+        style="?android:attr/preferenceInformationStyle"
+        android:title="@string/status_icc_id"
+        android:summary="@string/device_info_not_available"
+        android:persistent="false" />
     <Preference android:key="wifi_ip_address"
         style="?android:attr/preferenceInformationStyle"
         android:title="@string/wifi_advanced_ip_address_title"

src/com/android/settings/deviceinfo/Status.java

@@ -82,6 +82,7 @@ public class Status extends PreferenceActivity {
     private static final String KEY_WIFI_MAC_ADDRESS = "wifi_mac_address";
     private static final String KEY_BT_ADDRESS = "bt_address";
     private static final String KEY_SERIAL_NUMBER = "serial_number";
+    private static final String KEY_ICC_ID = "icc_id";
 
     private static final String[] PHONE_RELATED_ENTRIES = {
         KEY_DATA_STATE,
@@ -95,7 +96,8 @@ public class Status extends PreferenceActivity {
         KEY_PRL_VERSION,
         KEY_MIN_NUMBER,
         KEY_MEID_NUMBER,
-        KEY_SIGNAL_STRENGTH
+        KEY_SIGNAL_STRENGTH,
+        KEY_ICC_ID
     };
 
     private static final int EVENT_SIGNAL_STRENGTH_CHANGED = 200;
@@ -228,11 +230,18 @@ public class Status extends PreferenceActivity {
                 setSummaryText(KEY_MEID_NUMBER, mPhone.getMeid());
                 setSummaryText(KEY_MIN_NUMBER, mPhone.getCdmaMin());
                 setSummaryText(KEY_PRL_VERSION, mPhone.getCdmaPrlVersion());
+                removePreferenceFromScreen(KEY_IMEI_SV);
 
+                if (mPhone.getLteOnCdmaMode() == Phone.LTE_ON_CDMA_TRUE) {
+                    // Show ICC ID and IMEI for LTE device
+                    setSummaryText(KEY_ICC_ID, mPhone.getIccSerialNumber());
+                    setSummaryText(KEY_IMEI, mPhone.getImei());
+                } else {
                     // device is not GSM/UMTS, do not display GSM/UMTS features
                     // check Null in case no specified preference in overlay xml
                     removePreferenceFromScreen(KEY_IMEI);
-                removePreferenceFromScreen(KEY_IMEI_SV);
+                    removePreferenceFromScreen(KEY_ICC_ID);
+                }
             } else {
                 setSummaryText(KEY_IMEI, mPhone.getDeviceId());
 
@@ -245,6 +254,7 @@ public class Status extends PreferenceActivity {
                 removePreferenceFromScreen(KEY_PRL_VERSION);
                 removePreferenceFromScreen(KEY_MEID_NUMBER);
                 removePreferenceFromScreen(KEY_MIN_NUMBER);
+                removePreferenceFromScreen(KEY_ICC_ID);
             }
 
             String rawNumber = mPhone.getLine1Number();  // may be null or empty