Merge "Refine the About phone page." into sc-dev
This commit is contained in:
Stanley Wang
Android (Google) Code Review
@@ -12353,6 +12353,15 @@
|
||||
<!-- Title for preference showing the name of the device. [CHAR LIMIT=60]-->
|
||||
<string name="my_device_info_device_name_preference_title">Device name</string>
|
||||
|
||||
<!-- Title for preference category showing the name of basic info. [CHAR LIMIT=60]-->
|
||||
<string name="my_device_info_basic_info_category_title">Basic info</string>
|
||||
<!-- Title for preference category showing the name of legal & regulatory. [CHAR LIMIT=60]-->
|
||||
<string name="my_device_info_legal_category_title">Legal & regulatory</string>
|
||||
<!-- Title for preference category showing the name of device details. [CHAR LIMIT=60]-->
|
||||
<string name="my_device_info_device_details_category_title">Device details</string>
|
||||
<!-- Title for preference category showing the name of device identifiers. [CHAR LIMIT=60]-->
|
||||
<string name="my_device_info_device_identifiers_category_title">Device identifiers</string>
|
||||
|
||||
<!-- Title for Wifi Access settings [CHAR LIMIT=35] -->
|
||||
<string name="change_wifi_state_title">Wi-Fi control</string>
|
||||
|
||||
|
||||
@@ -28,173 +28,185 @@
|
||||
android:selectable="false"
|
||||
settings:isPreferenceVisible="false"/>
|
||||
|
||||
<!-- Device name -->
|
||||
<com.android.settings.widget.ValidatedEditTextPreference
|
||||
android:key="device_name"
|
||||
android:order="1"
|
||||
android:title="@string/my_device_info_device_name_preference_title"
|
||||
android:summary="@string/summary_placeholder"
|
||||
settings:controller="com.android.settings.deviceinfo.DeviceNamePreferenceController"
|
||||
settings:enableCopying="true"/>
|
||||
<PreferenceCategory
|
||||
android:title="@string/my_device_info_basic_info_category_title">
|
||||
|
||||
<!-- Account name -->
|
||||
<Preference
|
||||
android:key="branded_account"
|
||||
android:order="2"
|
||||
android:title="@string/my_device_info_account_preference_title"
|
||||
android:summary="@string/summary_placeholder"
|
||||
settings:enableCopying="true"
|
||||
settings:controller="com.android.settings.deviceinfo.BrandedAccountPreferenceController"/>
|
||||
<!-- Device name -->
|
||||
<com.android.settings.widget.ValidatedEditTextPreference
|
||||
android:key="device_name"
|
||||
android:order="1"
|
||||
android:title="@string/my_device_info_device_name_preference_title"
|
||||
android:summary="@string/summary_placeholder"
|
||||
settings:controller="com.android.settings.deviceinfo.DeviceNamePreferenceController"
|
||||
settings:enableCopying="true"/>
|
||||
|
||||
<!-- Phone number -->
|
||||
<Preference
|
||||
android:key="phone_number"
|
||||
android:order="3"
|
||||
android:title="@string/status_number"
|
||||
android:summary="@string/summary_placeholder"
|
||||
android:selectable="false"
|
||||
settings:controller="com.android.settings.deviceinfo.PhoneNumberPreferenceController"
|
||||
settings:enableCopying="true"/>
|
||||
<!-- Account name -->
|
||||
<Preference
|
||||
android:key="branded_account"
|
||||
android:order="2"
|
||||
android:title="@string/my_device_info_account_preference_title"
|
||||
android:summary="@string/summary_placeholder"
|
||||
settings:enableCopying="true"
|
||||
settings:controller="com.android.settings.deviceinfo.BrandedAccountPreferenceController"/>
|
||||
|
||||
<!-- Legal information -->
|
||||
<Preference
|
||||
android:key="legal_container"
|
||||
android:order="15"
|
||||
android:title="@string/legal_information"
|
||||
android:fragment="com.android.settings.LegalSettings"
|
||||
settings:allowDividerAbove="true"/>
|
||||
<!-- Phone number -->
|
||||
<Preference
|
||||
android:key="phone_number"
|
||||
android:order="3"
|
||||
android:title="@string/status_number"
|
||||
android:summary="@string/summary_placeholder"
|
||||
android:selectable="false"
|
||||
settings:controller="com.android.settings.deviceinfo.PhoneNumberPreferenceController"
|
||||
settings:enableCopying="true"/>
|
||||
</PreferenceCategory>
|
||||
|
||||
<!-- Regulatory labels -->
|
||||
<Preference
|
||||
android:key="regulatory_info"
|
||||
android:order="16"
|
||||
android:title="@string/regulatory_labels">
|
||||
<intent android:action="android.settings.SHOW_REGULATORY_INFO"/>
|
||||
</Preference>
|
||||
<PreferenceCategory
|
||||
android:title="@string/my_device_info_legal_category_title">
|
||||
|
||||
<!-- Safety & regulatory manual -->
|
||||
<Preference
|
||||
android:key="safety_info"
|
||||
android:order="17"
|
||||
android:title="@string/safety_and_regulatory_info">
|
||||
<intent android:action="android.settings.SHOW_SAFETY_AND_REGULATORY_INFO"/>
|
||||
</Preference>
|
||||
<!-- Legal information -->
|
||||
<Preference
|
||||
android:key="legal_container"
|
||||
android:order="15"
|
||||
android:title="@string/legal_information"
|
||||
android:fragment="com.android.settings.LegalSettings"/>
|
||||
|
||||
<!-- SIM status -->
|
||||
<Preference
|
||||
android:key="sim_status"
|
||||
android:order="18"
|
||||
android:title="@string/sim_status_title"
|
||||
settings:keywords="@string/keywords_sim_status"
|
||||
android:summary="@string/summary_placeholder"
|
||||
settings:enableCopying="true"
|
||||
settings:allowDividerAbove="true"/>
|
||||
<!-- Regulatory labels -->
|
||||
<Preference
|
||||
android:key="regulatory_info"
|
||||
android:order="16"
|
||||
android:title="@string/regulatory_labels">
|
||||
<intent android:action="android.settings.SHOW_REGULATORY_INFO"/>
|
||||
</Preference>
|
||||
|
||||
<!-- Model & hardware -->
|
||||
<Preference
|
||||
android:key="device_model"
|
||||
android:order="31"
|
||||
android:title="@string/model_info"
|
||||
android:summary="@string/summary_placeholder"
|
||||
android:fragment="com.android.settings.deviceinfo.hardwareinfo.HardwareInfoFragment"
|
||||
settings:enableCopying="true"
|
||||
settings:keywords="@string/keywords_model_and_hardware"
|
||||
settings:controller="com.android.settings.deviceinfo.HardwareInfoPreferenceController"/>
|
||||
<!-- Safety & regulatory manual -->
|
||||
<Preference
|
||||
android:key="safety_info"
|
||||
android:order="17"
|
||||
android:title="@string/safety_and_regulatory_info">
|
||||
<intent android:action="android.settings.SHOW_SAFETY_AND_REGULATORY_INFO"/>
|
||||
</Preference>
|
||||
</PreferenceCategory>
|
||||
|
||||
<!-- IMEI -->
|
||||
<Preference
|
||||
android:key="imei_info"
|
||||
android:order="32"
|
||||
android:title="@string/status_imei"
|
||||
android:summary="@string/summary_placeholder"
|
||||
settings:keywords="@string/keywords_imei_info"
|
||||
settings:enableCopying="true"
|
||||
settings:controller="com.android.settings.deviceinfo.imei.ImeiInfoPreferenceController"/>
|
||||
<PreferenceCategory
|
||||
android:title="@string/my_device_info_device_details_category_title">
|
||||
|
||||
<!-- Android version -->
|
||||
<Preference
|
||||
android:key="firmware_version"
|
||||
android:order="42"
|
||||
android:title="@string/firmware_version"
|
||||
android:summary="@string/summary_placeholder"
|
||||
android:fragment="com.android.settings.deviceinfo.firmwareversion.FirmwareVersionSettings"
|
||||
settings:controller="com.android.settings.deviceinfo.firmwareversion.FirmwareVersionPreferenceController"/>
|
||||
<!-- SIM status -->
|
||||
<Preference
|
||||
android:key="sim_status"
|
||||
android:order="18"
|
||||
android:title="@string/sim_status_title"
|
||||
settings:keywords="@string/keywords_sim_status"
|
||||
android:summary="@string/summary_placeholder"
|
||||
settings:enableCopying="true"/>
|
||||
|
||||
<!--IP address -->
|
||||
<Preference
|
||||
android:key="wifi_ip_address"
|
||||
android:order="44"
|
||||
android:title="@string/wifi_ip_address"
|
||||
android:summary="@string/summary_placeholder"
|
||||
android:selectable="false"
|
||||
settings:allowDividerAbove="true"
|
||||
settings:enableCopying="true"/>
|
||||
<!-- Model & hardware -->
|
||||
<Preference
|
||||
android:key="device_model"
|
||||
android:order="31"
|
||||
android:title="@string/model_info"
|
||||
android:summary="@string/summary_placeholder"
|
||||
android:fragment="com.android.settings.deviceinfo.hardwareinfo.HardwareInfoFragment"
|
||||
settings:enableCopying="true"
|
||||
settings:keywords="@string/keywords_model_and_hardware"
|
||||
settings:controller="com.android.settings.deviceinfo.HardwareInfoPreferenceController"/>
|
||||
|
||||
<!-- Wi-Fi MAC address -->
|
||||
<Preference
|
||||
android:key="saved_accesspoints_wifi_mac_address"
|
||||
android:order="45"
|
||||
android:title="@string/status_wifi_mac_address"
|
||||
android:summary="@string/view_saved_network"
|
||||
android:fragment="com.android.settings.wifi.savedaccesspoints2.SavedAccessPointsWifiSettings2"
|
||||
settings:enableCopying="false"/>
|
||||
<!-- IMEI -->
|
||||
<Preference
|
||||
android:key="imei_info"
|
||||
android:order="32"
|
||||
android:title="@string/status_imei"
|
||||
android:summary="@string/summary_placeholder"
|
||||
settings:keywords="@string/keywords_imei_info"
|
||||
settings:enableCopying="true"
|
||||
settings:controller="com.android.settings.deviceinfo.imei.ImeiInfoPreferenceController"/>
|
||||
|
||||
<!-- Factory Wi-Fi MAC address -->
|
||||
<Preference
|
||||
android:key="wifi_mac_address"
|
||||
android:order="46"
|
||||
android:title="@string/status_device_wifi_mac_address"
|
||||
android:summary="@string/summary_placeholder"
|
||||
android:selectable="false"
|
||||
settings:enableCopying="true"/>
|
||||
<!-- Android version -->
|
||||
<Preference
|
||||
android:key="firmware_version"
|
||||
android:order="42"
|
||||
android:title="@string/firmware_version"
|
||||
android:summary="@string/summary_placeholder"
|
||||
android:fragment="com.android.settings.deviceinfo.firmwareversion.FirmwareVersionSettings"
|
||||
settings:controller="com.android.settings.deviceinfo.firmwareversion.FirmwareVersionPreferenceController"/>
|
||||
</PreferenceCategory>
|
||||
|
||||
<!-- Bluetooth address -->
|
||||
<Preference
|
||||
android:key="bt_address"
|
||||
android:order="47"
|
||||
android:title="@string/status_bt_address"
|
||||
android:summary="@string/summary_placeholder"
|
||||
android:selectable="false"
|
||||
settings:enableCopying="true"/>
|
||||
<PreferenceCategory
|
||||
android:title="@string/my_device_info_device_identifiers_category_title">
|
||||
|
||||
<!-- Device up time -->
|
||||
<Preference
|
||||
android:key="up_time"
|
||||
android:order="48"
|
||||
android:title="@string/status_up_time"
|
||||
android:summary="@string/summary_placeholder"
|
||||
android:selectable="false"/>
|
||||
<!--IP address -->
|
||||
<Preference
|
||||
android:key="wifi_ip_address"
|
||||
android:order="44"
|
||||
android:title="@string/wifi_ip_address"
|
||||
android:summary="@string/summary_placeholder"
|
||||
android:selectable="false"
|
||||
settings:enableCopying="true"/>
|
||||
|
||||
<!-- Manual -->
|
||||
<Preference
|
||||
android:key="manual"
|
||||
android:order="50"
|
||||
android:title="@string/manual">
|
||||
<intent android:action="android.settings.SHOW_MANUAL"/>
|
||||
</Preference>
|
||||
<!-- Wi-Fi MAC address -->
|
||||
<Preference
|
||||
android:key="saved_accesspoints_wifi_mac_address"
|
||||
android:order="45"
|
||||
android:title="@string/status_wifi_mac_address"
|
||||
android:summary="@string/view_saved_network"
|
||||
android:fragment="com.android.settings.wifi.savedaccesspoints2.SavedAccessPointsWifiSettings2"
|
||||
settings:enableCopying="false"/>
|
||||
|
||||
<!-- Feedback on the device -->
|
||||
<Preference
|
||||
android:key="device_feedback"
|
||||
android:order="51"
|
||||
android:title="@string/device_feedback"
|
||||
settings:keywords="@string/keywords_device_feedback"/>
|
||||
<!-- Factory Wi-Fi MAC address -->
|
||||
<Preference
|
||||
android:key="wifi_mac_address"
|
||||
android:order="46"
|
||||
android:title="@string/status_device_wifi_mac_address"
|
||||
android:summary="@string/summary_placeholder"
|
||||
android:selectable="false"
|
||||
settings:enableCopying="true"/>
|
||||
|
||||
<!-- Device FCC equipment id -->
|
||||
<Preference
|
||||
android:key="fcc_equipment_id"
|
||||
android:order="52"
|
||||
android:title="@string/fcc_equipment_id"
|
||||
android:summary="@string/summary_placeholder"/>
|
||||
<!-- Bluetooth address -->
|
||||
<Preference
|
||||
android:key="bt_address"
|
||||
android:order="47"
|
||||
android:title="@string/status_bt_address"
|
||||
android:summary="@string/summary_placeholder"
|
||||
android:selectable="false"
|
||||
settings:enableCopying="true"/>
|
||||
|
||||
<!-- Build number -->
|
||||
<Preference
|
||||
android:key="build_number"
|
||||
android:order="53"
|
||||
android:title="@string/build_number"
|
||||
android:summary="@string/summary_placeholder"
|
||||
settings:allowDividerAbove="true"
|
||||
settings:enableCopying="true"
|
||||
settings:controller="com.android.settings.deviceinfo.BuildNumberPreferenceController"/>
|
||||
<!-- Device up time -->
|
||||
<Preference
|
||||
android:key="up_time"
|
||||
android:order="48"
|
||||
android:title="@string/status_up_time"
|
||||
android:summary="@string/summary_placeholder"
|
||||
android:selectable="false"/>
|
||||
|
||||
<!-- Manual -->
|
||||
<Preference
|
||||
android:key="manual"
|
||||
android:order="50"
|
||||
android:title="@string/manual">
|
||||
<intent android:action="android.settings.SHOW_MANUAL"/>
|
||||
</Preference>
|
||||
|
||||
<!-- Feedback on the device -->
|
||||
<Preference
|
||||
android:key="device_feedback"
|
||||
android:order="51"
|
||||
android:title="@string/device_feedback"
|
||||
settings:keywords="@string/keywords_device_feedback"/>
|
||||
|
||||
<!-- Device FCC equipment id -->
|
||||
<Preference
|
||||
android:key="fcc_equipment_id"
|
||||
android:order="52"
|
||||
android:title="@string/fcc_equipment_id"
|
||||
android:summary="@string/summary_placeholder"/>
|
||||
|
||||
<!-- Build number -->
|
||||
<Preference
|
||||
android:key="build_number"
|
||||
android:order="53"
|
||||
android:title="@string/build_number"
|
||||
android:summary="@string/summary_placeholder"
|
||||
settings:enableCopying="true"
|
||||
settings:controller="com.android.settings.deviceinfo.BuildNumberPreferenceController"/>
|
||||
</PreferenceCategory>
|
||||
|
||||
</PreferenceScreen>
|
||||
|
||||
Reference in New Issue
Block a user