[DS] DSDS support for Settings

+ Rebase and modify as APIs rename.
+ Fix bugs on set sub's name as title.
+ Enabled Sim Settings.

Change-Id: Ic731c7882be95b86b6b8dcdd3f208a6125681f3e

1 files changed, 14 insertions, 73 deletions

diff --git a/res/xml/device_info_status.xml b/res/xml/device_info_status.xml
index 38a3e80..26b067b 100644
--- a/res/xml/device_info_status.xml
+++ b/res/xml/device_info_status.xml
@@ -27,79 +27,20 @@
         android:title="@string/battery_level_title"
         android:summary="@string/device_info_not_available"
         android:persistent="false" />
-    <Preference android:key="operator_name"
-        style="?android:attr/preferenceInformationStyle"
-        android:title="@string/status_operator"
-        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"
-        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"
-        android:summary="@string/device_info_not_available"
-        android:persistent="false" />
-    <Preference android:key="latest_area_info"
-        style="?android:attr/preferenceInformationStyle"
-        android:title="@string/status_latest_area_info"
-        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"
-        android:summary="@string/device_info_not_available"
-        android:persistent="false" />
-    <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="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="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"
-        android:summary="@string/device_info_not_available"
-        android:persistent="false" />
-    <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" />
+    <PreferenceScreen android:key="sim_status"
+        android:title="@string/sim_status_title"
+        android:summary="@string/sim_status_summary"
+        android:persistent="false">
+        <intent android:targetPackage="com.android.settings"
+            android:targetClass="com.android.settings.deviceinfo.SimStatus" />
+    </PreferenceScreen>
+    <PreferenceScreen android:key="imei_info"
+        android:title="@string/imei_information_title"
+        android:summary="@string/imei_information_summary"
+        android:persistent="false">
+        <intent android:targetPackage="com.android.settings"
+            android:targetClass="com.android.settings.deviceinfo.ImeiInformation" />
+    </PreferenceScreen>
     <Preference android:key="wifi_ip_address"
         style="?android:attr/preferenceInformationStyle"
         android:title="@string/wifi_advanced_ip_address_title"