PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Refine the About phone page." into sc-dev

Browse Source
This commit is contained in:
Stanley Wang
2021-06-23 03:00:19 +00:00
committed by Android (Google) Code Review
parent 2de946e584 0c5bc76208
commit 95f2a11593
2 changed files with 171 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
res/values/strings.xml
View File

@@ -12353,6 +12353,15 @@
<!-- Title for preference showing the name of the device. [CHAR LIMIT=60]--> <!-- Title for preference showing the name of the device. [CHAR LIMIT=60]-->
<string name="my_device_info_device_name_preference_title">Device name</string> <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 &amp; 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] --> <!-- Title for Wifi Access settings [CHAR LIMIT=35] -->
<string name="change_wifi_state_title">Wi-Fi control</string> <string name="change_wifi_state_title">Wi-Fi control</string>

312
res/xml/my_device_info.xml
View File

@@ -28,173 +28,185 @@
android:selectable="false" android:selectable="false"
settings:isPreferenceVisible="false"/> settings:isPreferenceVisible="false"/>
<!-- Device name --> <PreferenceCategory
<com.android.settings.widget.ValidatedEditTextPreference android:title="@string/my_device_info_basic_info_category_title">
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"/>
<!-- Account name --> <!-- Device name -->
<Preference <com.android.settings.widget.ValidatedEditTextPreference
android:key="branded_account" android:key="device_name"
android:order="2" android:order="1"
android:title="@string/my_device_info_account_preference_title" android:title="@string/my_device_info_device_name_preference_title"
android:summary="@string/summary_placeholder" android:summary="@string/summary_placeholder"
settings:enableCopying="true" settings:controller="com.android.settings.deviceinfo.DeviceNamePreferenceController"
settings:controller="com.android.settings.deviceinfo.BrandedAccountPreferenceController"/> settings:enableCopying="true"/>
<!-- Phone number --> <!-- Account name -->
<Preference <Preference
android:key="phone_number" android:key="branded_account"
android:order="3" android:order="2"
android:title="@string/status_number" android:title="@string/my_device_info_account_preference_title"
android:summary="@string/summary_placeholder" android:summary="@string/summary_placeholder"
android:selectable="false" settings:enableCopying="true"
settings:controller="com.android.settings.deviceinfo.PhoneNumberPreferenceController" settings:controller="com.android.settings.deviceinfo.BrandedAccountPreferenceController"/>
settings:enableCopying="true"/>
<!-- Legal information --> <!-- Phone number -->
<Preference <Preference
android:key="legal_container" android:key="phone_number"
android:order="15" android:order="3"
android:title="@string/legal_information" android:title="@string/status_number"
android:fragment="com.android.settings.LegalSettings" android:summary="@string/summary_placeholder"
settings:allowDividerAbove="true"/> android:selectable="false"
settings:controller="com.android.settings.deviceinfo.PhoneNumberPreferenceController"
settings:enableCopying="true"/>
</PreferenceCategory>
<!-- Regulatory labels --> <PreferenceCategory
<Preference android:title="@string/my_device_info_legal_category_title">
android:key="regulatory_info"
android:order="16"
android:title="@string/regulatory_labels">
<intent android:action="android.settings.SHOW_REGULATORY_INFO"/>
</Preference>
<!-- Safety & regulatory manual --> <!-- Legal information -->
<Preference <Preference
android:key="safety_info" android:key="legal_container"
android:order="17" android:order="15"
android:title="@string/safety_and_regulatory_info"> android:title="@string/legal_information"
<intent android:action="android.settings.SHOW_SAFETY_AND_REGULATORY_INFO"/> android:fragment="com.android.settings.LegalSettings"/>
</Preference>
<!-- SIM status --> <!-- Regulatory labels -->
<Preference <Preference
android:key="sim_status" android:key="regulatory_info"
android:order="18" android:order="16"
android:title="@string/sim_status_title" android:title="@string/regulatory_labels">
settings:keywords="@string/keywords_sim_status" <intent android:action="android.settings.SHOW_REGULATORY_INFO"/>
android:summary="@string/summary_placeholder" </Preference>
settings:enableCopying="true"
settings:allowDividerAbove="true"/>
<!-- Model & hardware --> <!-- Safety & regulatory manual -->
<Preference <Preference
android:key="device_model" android:key="safety_info"
android:order="31" android:order="17"
android:title="@string/model_info" android:title="@string/safety_and_regulatory_info">
android:summary="@string/summary_placeholder" <intent android:action="android.settings.SHOW_SAFETY_AND_REGULATORY_INFO"/>
android:fragment="com.android.settings.deviceinfo.hardwareinfo.HardwareInfoFragment" </Preference>
settings:enableCopying="true" </PreferenceCategory>
settings:keywords="@string/keywords_model_and_hardware"
settings:controller="com.android.settings.deviceinfo.HardwareInfoPreferenceController"/>
<!-- IMEI --> <PreferenceCategory
<Preference android:title="@string/my_device_info_device_details_category_title">
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"/>
<!-- Android version --> <!-- SIM status -->
<Preference <Preference
android:key="firmware_version" android:key="sim_status"
android:order="42" android:order="18"
android:title="@string/firmware_version" android:title="@string/sim_status_title"
android:summary="@string/summary_placeholder" settings:keywords="@string/keywords_sim_status"
android:fragment="com.android.settings.deviceinfo.firmwareversion.FirmwareVersionSettings" android:summary="@string/summary_placeholder"
settings:controller="com.android.settings.deviceinfo.firmwareversion.FirmwareVersionPreferenceController"/> settings:enableCopying="true"/>
<!--IP address --> <!-- Model & hardware -->
<Preference <Preference
android:key="wifi_ip_address" android:key="device_model"
android:order="44" android:order="31"
android:title="@string/wifi_ip_address" android:title="@string/model_info"
android:summary="@string/summary_placeholder" android:summary="@string/summary_placeholder"
android:selectable="false" android:fragment="com.android.settings.deviceinfo.hardwareinfo.HardwareInfoFragment"
settings:allowDividerAbove="true" settings:enableCopying="true"
settings:enableCopying="true"/> settings:keywords="@string/keywords_model_and_hardware"
settings:controller="com.android.settings.deviceinfo.HardwareInfoPreferenceController"/>
<!-- Wi-Fi MAC address --> <!-- IMEI -->
<Preference <Preference
android:key="saved_accesspoints_wifi_mac_address" android:key="imei_info"
android:order="45" android:order="32"
android:title="@string/status_wifi_mac_address" android:title="@string/status_imei"
android:summary="@string/view_saved_network" android:summary="@string/summary_placeholder"
android:fragment="com.android.settings.wifi.savedaccesspoints2.SavedAccessPointsWifiSettings2" settings:keywords="@string/keywords_imei_info"
settings:enableCopying="false"/> settings:enableCopying="true"
settings:controller="com.android.settings.deviceinfo.imei.ImeiInfoPreferenceController"/>
<!-- Factory Wi-Fi MAC address --> <!-- Android version -->
<Preference <Preference
android:key="wifi_mac_address" android:key="firmware_version"
android:order="46" android:order="42"
android:title="@string/status_device_wifi_mac_address" android:title="@string/firmware_version"
android:summary="@string/summary_placeholder" android:summary="@string/summary_placeholder"
android:selectable="false" android:fragment="com.android.settings.deviceinfo.firmwareversion.FirmwareVersionSettings"
settings:enableCopying="true"/> settings:controller="com.android.settings.deviceinfo.firmwareversion.FirmwareVersionPreferenceController"/>
</PreferenceCategory>
<!-- Bluetooth address --> <PreferenceCategory
<Preference android:title="@string/my_device_info_device_identifiers_category_title">
android:key="bt_address"
android:order="47"
android:title="@string/status_bt_address"
android:summary="@string/summary_placeholder"
android:selectable="false"
settings:enableCopying="true"/>
<!-- Device up time --> <!--IP address -->
<Preference <Preference
android:key="up_time" android:key="wifi_ip_address"
android:order="48" android:order="44"
android:title="@string/status_up_time" android:title="@string/wifi_ip_address"
android:summary="@string/summary_placeholder" android:summary="@string/summary_placeholder"
android:selectable="false"/> android:selectable="false"
settings:enableCopying="true"/>
<!-- Manual --> <!-- Wi-Fi MAC address -->
<Preference <Preference
android:key="manual" android:key="saved_accesspoints_wifi_mac_address"
android:order="50" android:order="45"
android:title="@string/manual"> android:title="@string/status_wifi_mac_address"
<intent android:action="android.settings.SHOW_MANUAL"/> android:summary="@string/view_saved_network"
</Preference> android:fragment="com.android.settings.wifi.savedaccesspoints2.SavedAccessPointsWifiSettings2"
settings:enableCopying="false"/>
<!-- Feedback on the device --> <!-- Factory Wi-Fi MAC address -->
<Preference <Preference
android:key="device_feedback" android:key="wifi_mac_address"
android:order="51" android:order="46"
android:title="@string/device_feedback" android:title="@string/status_device_wifi_mac_address"
settings:keywords="@string/keywords_device_feedback"/> android:summary="@string/summary_placeholder"
android:selectable="false"
settings:enableCopying="true"/>
<!-- Device FCC equipment id --> <!-- Bluetooth address -->
<Preference <Preference
android:key="fcc_equipment_id" android:key="bt_address"
android:order="52" android:order="47"
android:title="@string/fcc_equipment_id" android:title="@string/status_bt_address"
android:summary="@string/summary_placeholder"/> android:summary="@string/summary_placeholder"
android:selectable="false"
settings:enableCopying="true"/>
<!-- Build number --> <!-- Device up time -->
<Preference <Preference
android:key="build_number" android:key="up_time"
android:order="53" android:order="48"
android:title="@string/build_number" android:title="@string/status_up_time"
android:summary="@string/summary_placeholder" android:summary="@string/summary_placeholder"
settings:allowDividerAbove="true" android:selectable="false"/>
settings:enableCopying="true"
settings:controller="com.android.settings.deviceinfo.BuildNumberPreferenceController"/> <!-- 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> </PreferenceScreen>