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

1 files changed, 48 insertions, 43 deletions

diff --git a/res/xml/device_info_status.xml b/res/xml/device_info_status.xml
index 369c565..19e22f4 100644
--- a/res/xml/device_info_status.xml
+++ b/res/xml/device_info_status.xml
@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,91 +17,96 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
         android:title="@string/device_status_activity_title">
 
-    <Preference android:key="battery_status" 
-        style="?android:attr/preferenceInformationStyle" 
+    <Preference android:key="battery_status"
+        style="?android:attr/preferenceInformationStyle"
         android:title="@string/battery_status_title"
         android:summary="@string/device_info_not_available"
         android:persistent="false" />
-    <Preference android:key="battery_level" 
-        style="?android:attr/preferenceInformationStyle" 
+    <Preference android:key="battery_level"
+        style="?android:attr/preferenceInformationStyle"
         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"
+    <Preference android:key="operator_name"
+        style="?android:attr/preferenceInformationStyle"
+        android:title="@string/status_operator"
         android:summary="@string/device_info_not_available"
         android:persistent="false" />
-    <!-- This menu item is only for CDMA phone -->
-    <Preference android:key="min_number"
+    <Preference android:key="signal_strength"
         style="?android:attr/preferenceInformationStyle"
-        android:title="@string/status_min_number"
+        android:title="@string/status_signal_strength"
         android:summary="@string/device_info_not_available"
         android:persistent="false" />
-    <!-- This menu item is only for CDMA phone -->
-    <Preference android:key="prl_version"
+    <Preference android:key="network_type"
         style="?android:attr/preferenceInformationStyle"
-        android:title="@string/status_prl_version"
+        android:title="@string/status_network_type"
         android:summary="@string/device_info_not_available"
         android:persistent="false" />
-    <!-- This menu item is only for CDMA phone -->
-    <Preference android:key="meid_number"
+    <Preference android:key="service_state"
         style="?android:attr/preferenceInformationStyle"
-        android:title="@string/status_meid_number"
+        android:title="@string/status_service_state"
         android:summary="@string/device_info_not_available"
         android:persistent="false" />
-    <Preference android:key="operator_name" 
-        style="?android:attr/preferenceInformationStyle" 
-        android:title="@string/status_operator"
+    <Preference android:key="roaming_state"
+        style="?android:attr/preferenceInformationStyle"
+        android:title="@string/status_roaming"
         android:summary="@string/device_info_not_available"
         android:persistent="false" />
-    <Preference android:key="signal_strength"
-        style="?android:attr/preferenceInformationStyle" 
-        android:title="@string/status_signal_strength"
+    <Preference android:key="data_state"
+        style="?android:attr/preferenceInformationStyle"
+        android:title="@string/status_data_state"
         android:summary="@string/device_info_not_available"
         android:persistent="false" />
-    <Preference android:key="network_type"
-        style="?android:attr/preferenceInformationStyle" 
-        android:title="@string/status_network_type"
+    <Preference android:key="number"
+        style="?android:attr/preferenceInformationStyle"
+        android:title="@string/status_number"
         android:summary="@string/device_info_not_available"
         android:persistent="false" />
-    <Preference android:key="service_state" 
-        style="?android:attr/preferenceInformationStyle" 
-        android:title="@string/status_service_state"
+    <!-- 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" />
-    <Preference android:key="roaming_state" 
-        style="?android:attr/preferenceInformationStyle" 
-        android:title="@string/status_roaming"
+    <!-- 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" />
-    <Preference android:key="data_state"
-        style="?android:attr/preferenceInformationStyle" 
-        android:title="@string/status_data_state"
+    <!-- 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" 
+    <Preference android:key="imei"
+        style="?android:attr/preferenceInformationStyle"
         android:title="@string/status_imei"
         android:summary="@string/device_info_not_available"
         android:persistent="false" />
-    <Preference android:key="imei_sv" 
-        style="?android:attr/preferenceInformationStyle" 
+    <Preference android:key="imei_sv"
+        style="?android:attr/preferenceInformationStyle"
         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"
         android:summary="@string/device_info_not_available"
         android:persistent="false" />
     <Preference android:key="wifi_mac_address"
-        style="?android:attr/preferenceInformationStyle" 
+        style="?android:attr/preferenceInformationStyle"
         android:title="@string/status_wifi_mac_address"
         android:summary="@string/device_info_not_available"
         android:persistent="false" />
     <Preference android:key="bt_address"
-        style="?android:attr/preferenceInformationStyle" 
+        style="?android:attr/preferenceInformationStyle"
         android:title="@string/status_bt_address"
         android:summary="@string/device_info_not_available"
         android:persistent="false" />
@@ -111,7 +116,7 @@
         android:summary="@string/device_info_not_available"
         android:persistent="false" />
     <Preference android:key="up_time"
-        style="?android:attr/preferenceInformationStyle" 
+        style="?android:attr/preferenceInformationStyle"
         android:title="@string/status_up_time"
         android:summary="@string/device_info_not_available"
         android:persistent="false" />