Add Manufacturer to device info

[android-x86/packages-apps-Settings.git] / res / xml / device_info_settings.xml

diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml
index 5638f4f..cf1a993 100644 (file)
--- a/res/xml/device_info_settings.xml
+++ b/res/xml/device_info_settings.xml
@@ -18,106 +18,99 @@
         android:title="@string/about_settings">
 
         <!-- System update settings - launches activity -->
-        <PreferenceScreen android:key="system_update_settings"
-                android:title="@string/system_update_settings_list_item_title"
-                android:summary="@string/system_update_settings_list_item_summary">
-            <intent android:action="android.settings.SYSTEM_UPDATE_SETTINGS" />
-        </PreferenceScreen>
-
-
-        <PreferenceScreen android:key="additional_system_update_settings"
-                          android:title="@string/additional_system_update_settings_list_item_title">
+        <Preference android:key="additional_system_update_settings"
+                    android:title="@string/additional_system_update_settings_list_item_title">
             <intent android:action="android.intent.action.MAIN"
                     android:targetPackage="@string/additional_system_update"
                     android:targetClass="@string/additional_system_update_menu" />
-        </PreferenceScreen>
+        </Preference>
 
         <!-- Device status - launches activity -->
-        <PreferenceScreen android:key="status_info"
+        <Preference android:key="status_info"
                 android:title="@string/device_status"
-                android:summary="@string/device_status_summary">
-            <intent android:action="android.intent.action.MAIN"
-                    android:targetPackage="com.android.settings"
-                    android:targetClass="com.android.settings.Settings$StatusActivity" />
-        </PreferenceScreen>
+                android:summary="@string/device_status_summary"
+                android:fragment="com.android.settings.deviceinfo.Status"/>
 
         <!-- Manual -->
-        <PreferenceScreen
+        <Preference
                 android:key="manual"
                 android:title="@string/manual">
             <intent android:action="android.settings.SHOW_MANUAL" />
-        </PreferenceScreen>
+        </Preference>
 
         <!-- Legal Information -->
-        <PreferenceScreen
-                android:key="container"
+        <Preference
+                android:key="legal_container"
                 android:title="@string/legal_information"
                 android:fragment="com.android.settings.LegalSettings" />
 
-        <PreferenceScreen
+        <Preference
                 android:key="regulatory_info"
-                android:title="@string/regulatory_information">
+                android:title="@string/regulatory_labels">
             <intent android:action="android.settings.SHOW_REGULATORY_INFO" />
-        </PreferenceScreen>
+        </Preference>
+
+        <Preference
+                android:key="safety_info"
+                android:title="@string/safety_and_regulatory_info">
+                <intent android:action="android.settings.SHOW_SAFETY_AND_REGULATORY_INFO" />
+        </Preference>
 
         <!-- Feedback on the device -->
-        <PreferenceScreen android:key="device_feedback"
-                android:title="@string/device_feedback">
-        </PreferenceScreen>
+        <Preference android:key="device_feedback"
+                android:title="@string/device_feedback" />
 
-        <!-- Device hardware model -->
-        <Preference android:key="device_model"
-                android:enabled="false"
-                android:shouldDisableView="false"
-                android:title="@string/model_number"
+        <!-- Device manufacturer -->
+        <Preference android:key="device_manufacturer"
+                android:title="@string/device_manufacturer"
                 android:summary="@string/device_info_default"/>
 
+        <!-- Device hardware model -->
+        <Preference
+                android:key="device_model"
+                android:title="@string/model_info"
+                android:summary="@string/summary_placeholder"/>
+
         <!-- Device firmware version -->
         <Preference android:key="firmware_version"
-                android:enabled="false"
-                android:shouldDisableView="false"
                 android:title="@string/firmware_version"
-                android:summary="@string/device_info_default"/>
+                android:summary="@string/summary_placeholder"/>
 
         <!-- Security patch level -->
         <Preference android:key="security_patch"
-                android:enabled="false"
-                android:shouldDisableView="false"
                 android:title="@string/security_patch"
-                android:summary="@string/device_info_default"/>
+                android:summary="@string/summary_placeholder">
+                <intent android:action="android.intent.action.VIEW"
+                        android:data="https://source.android.com/security/bulletin/" />
+        </Preference>
 
         <!-- Device FCC equipment id -->
-        <Preference android:key="fcc_equipment_id"
-                android:enabled="false"
-                android:shouldDisableView="false"
+        <Preference
+                android:key="fcc_equipment_id"
                 android:title="@string/fcc_equipment_id"
-                android:summary="@string/device_info_default"/>
+                android:summary="@string/summary_placeholder"/>
 
         <!-- Device Baseband version -->
-        <Preference android:key="baseband_version"
-                android:enabled="false"
-                android:shouldDisableView="false"
+        <Preference
+                android:key="baseband_version"
                 android:title="@string/baseband_version"
-                android:summary="@string/device_info_default"/>
+                android:summary="@string/summary_placeholder"/>
 
         <!-- Device Kernel version -->
-        <Preference android:key="kernel_version"
-                android:enabled="false"
-                android:shouldDisableView="false"
+        <Preference
+                android:key="kernel_version"
                 android:title="@string/kernel_version"
-                android:summary="@string/device_info_default"/>
+                android:summary="@string/summary_placeholder"/>
 
         <!-- Detailed build version -->
-        <Preference android:key="build_number"
-                android:enabled="false"
-                android:shouldDisableView="false"
+        <Preference
+                android:key="build_number"
                 android:title="@string/build_number"
-                android:summary="@string/device_info_default"/>
+                android:summary="@string/summary_placeholder"/>
 
         <!-- SELinux status information -->
-        <Preference android:key="selinux_status"
-                android:enabled="false"
-                android:shouldDisableView="false"
+        <Preference
+                android:key="selinux_status"
                 android:title="@string/selinux_status"
                 android:summary="@string/selinux_status_enforcing"/>