OSDN Git Service

Add Manufacturer to device info
[android-x86/packages-apps-Settings.git] / res / xml / device_info_settings.xml
index 6785a50..cf1a993 100644 (file)
@@ -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.
         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"
-                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.deviceinfo.Status" />
-        </PreferenceScreen>
+        <Preference android:key="status_info"
+                android:title="@string/device_status"
+                android:summary="@string/device_status_summary"
+                android:fragment="com.android.settings.deviceinfo.Status"/>
+
+        <!-- Manual -->
+        <Preference
+                android:key="manual"
+                android:title="@string/manual">
+            <intent android:action="android.settings.SHOW_MANUAL" />
+        </Preference>
 
         <!-- Legal Information -->
-        <PreferenceScreen
-                android:key="container"
-                android:title="@string/legal_information">
-                    
-            <!-- Note: The titles given here probably won't be used.  Instead, we programmatically
-                       fill the title with the label of the activity with the corresponding action.
-                       If there is not an activity for an action, the item will be removed from the
-                       list. -->
-
-            <!-- Copyright information -->
-            <PreferenceScreen
-                    android:key="copyright"
-                    android:title="@string/copyright_title">
-                <intent android:action="android.settings.COPYRIGHT" />
-            </PreferenceScreen>
-
-            <!-- License information -->
-            <PreferenceScreen
-                    android:key="license"
-                    android:title="@string/license_title">
-                <intent android:action="android.settings.LICENSE" />
-            </PreferenceScreen>
-
-            <!-- Terms and conditions -->
-            <PreferenceScreen
-                    android:key="terms"
-                    android:title="@string/terms_title">
-                <intent android:action="android.settings.TERMS" />
-            </PreferenceScreen>
-
-            <!-- System WebView License information -->
-            <PreferenceScreen
-                    android:key="webview_license"
-                    android:title="@string/webview_license_title">
-                <intent android:action="android.settings.WEBVIEW_LICENSE" />
-            </PreferenceScreen>
-
-            <Preference
-                    android:key="wallpaper_attributions"
-                    android:title="@string/wallpaper_attributions"
-                    android:summary="@string/wallpaper_attributions_values"
-                    />
-
-        </PreferenceScreen>
-
-        <PreferenceScreen
+        <Preference
+                android:key="legal_container"
+                android:title="@string/legal_information"
+                android:fragment="com.android.settings.LegalSettings" />
+
+        <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" 
-                style="?android:preferenceInformationStyle"
-                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" 
-                style="?android:preferenceInformationStyle"
+        <Preference android:key="firmware_version"
                 android:title="@string/firmware_version"
-                android:summary="@string/device_info_default"/>
+                android:summary="@string/summary_placeholder"/>
 
         <!-- Security patch level -->
         <Preference android:key="security_patch"
-                style="?android:preferenceInformationStyle"
                 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"
-                style="?android:preferenceInformationStyle"
+        <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" 
-                style="?android:preferenceInformationStyle"
+        <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" 
-                style="?android:preferenceInformationStyle"
+        <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" 
-                style="?android:preferenceInformationStyle"
+        <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"
-                style="?android:preferenceInformationStyle"
+        <Preference
+                android:key="selinux_status"
                 android:title="@string/selinux_status"
                 android:summary="@string/selinux_status_enforcing"/>