Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13934a94 authored by Stanley Wang's avatar Stanley Wang Committed by Automerger Merge Worker
Browse files

Merge "Refine the About phone page." into sc-dev am: 95f2a115 am: 0f97f4c7 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056865

Change-Id: I8297697d666cfefbe4a5b74b9b2b31cb94a67399
parents 02ca3665 0f97f4c7

res/values/strings.xml

+9 −0
Original line number Diff line number Diff line
@@ -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 &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] -->









    <string name="change_wifi_state_title">Wi-Fi control</string>

































res/xml/my_device_info.xml



+180
−168






























Original line number
Diff line number
Diff line







@@ -28,6 +28,9 @@







        android:selectable="false"









        settings:isPreferenceVisible="false"/>



















    <PreferenceCategory









        android:title="@string/my_device_info_basic_info_category_title">



















        <!-- Device name -->









        <com.android.settings.widget.ValidatedEditTextPreference









            android:key="device_name"








@@ -55,14 +58,17 @@







            android:selectable="false"









            settings:controller="com.android.settings.deviceinfo.PhoneNumberPreferenceController"









            settings:enableCopying="true"/>









    </PreferenceCategory>



















    <PreferenceCategory









        android:title="@string/my_device_info_legal_category_title">



















        <!-- Legal information -->









        <Preference









            android:key="legal_container"









            android:order="15"









            android:title="@string/legal_information"









        android:fragment="com.android.settings.LegalSettings"









        settings:allowDividerAbove="true"/>









            android:fragment="com.android.settings.LegalSettings"/>



















        <!-- Regulatory labels -->









        <Preference








@@ -79,6 +85,10 @@







            android:title="@string/safety_and_regulatory_info">









            <intent android:action="android.settings.SHOW_SAFETY_AND_REGULATORY_INFO"/>









        </Preference>









    </PreferenceCategory>



















    <PreferenceCategory









        android:title="@string/my_device_info_device_details_category_title">



















        <!-- SIM status -->









        <Preference








@@ -87,8 +97,7 @@







            android:title="@string/sim_status_title"









            settings:keywords="@string/keywords_sim_status"









            android:summary="@string/summary_placeholder"









        settings:enableCopying="true"









        settings:allowDividerAbove="true"/>









            settings:enableCopying="true"/>



















        <!-- Model & hardware -->









        <Preference








@@ -119,6 +128,10 @@







            android:summary="@string/summary_placeholder"









            android:fragment="com.android.settings.deviceinfo.firmwareversion.FirmwareVersionSettings"









            settings:controller="com.android.settings.deviceinfo.firmwareversion.FirmwareVersionPreferenceController"/>









    </PreferenceCategory>



















    <PreferenceCategory









        android:title="@string/my_device_info_device_identifiers_category_title">



















        <!--IP address -->









        <Preference








@@ -127,7 +140,6 @@







            android:title="@string/wifi_ip_address"









            android:summary="@string/summary_placeholder"









            android:selectable="false"









        settings:allowDividerAbove="true"









            settings:enableCopying="true"/>



















        <!-- Wi-Fi MAC address -->








@@ -193,8 +205,8 @@







            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"/>









    </PreferenceCategory>



















</PreferenceScreen>