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

Commit ac26cd54 authored by Goven Liu's avatar Goven Liu Committed by Android (Google) Code Review
Browse files

Merge "[Wi-Fi] WiFi Settings inclusive language fix plan phase 1"

parents 6bbeb49a b70ddb9d

res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -1840,7 +1840,7 @@ 
    <string name="wifi_settings">Wi\u2011Fi</string>









    <!-- Used in the Wi-Fi settings screen to control turning on/off Wi-Fi entirely [CHAR LIMIT=30]-->









    <string name="wifi_settings_master_switch_title">Use Wi\u2011Fi</string>









    <string name="wifi_settings_primary_switch_title">Use Wi\u2011Fi</string>









    <!-- Title of the Wi-fi settings screen -->









    <string name="wifi_settings_category">Wi\u2011Fi settings</string>









    <!-- Title of the Wi-fi settings entry in the left top level menu -->
































res/xml/development_settings.xml



+1
−1






























Original line number
Diff line number
Diff line







@@ -143,7 +143,7 @@







        <Preference android:key="clear_adb_keys"









                    android:title="@string/clear_adb_keys" />



















        <com.android.settings.widget.MasterSwitchPreference









        <com.android.settings.widget.PrimarySwitchPreference









            android:fragment="com.android.settings.development.WirelessDebuggingFragment"









            android:key="toggle_adb_wireless"









            android:title="@string/enable_adb_wireless"
































res/xml/network_and_internet.xml



+3
−3






























Original line number
Diff line number
Diff line







@@ -29,7 +29,7 @@







        android:order="-40"









        settings:controller="com.android.settings.network.MultiNetworkHeaderController"/>



















    <com.android.settings.widget.MasterSwitchPreference









    <com.android.settings.widget.PrimarySwitchPreference









        android:fragment="com.android.settings.wifi.WifiSettings"









        android:key="main_toggle_wifi"









        android:title="@string/wifi_settings"








@@ -40,7 +40,7 @@







        <intent









            android:action="android.settings.WIFI_SETTINGS"









            android:targetClass="Settings$WifiSettingsActivity" />









    </com.android.settings.widget.MasterSwitchPreference>









    </com.android.settings.widget.PrimarySwitchPreference>



















    <com.android.settings.widget.AddPreference









        android:key="mobile_network_list"








@@ -80,7 +80,7 @@







        settings:userRestriction="no_config_tethering"









        settings:useAdminDisabledSummary="true" />



















    <com.android.settings.widget.MasterSwitchPreference









    <com.android.settings.widget.PrimarySwitchPreference









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









        android:key="all_tether_settings"









        android:title="@string/tether_settings_title_all"
































res/xml/privacy_dashboard_settings.xml



+2
−2






























Original line number
Diff line number
Diff line







@@ -109,11 +109,11 @@







        android:summary="@string/content_capture_summary"









        settings:controller="com.android.settings.privacy.EnableContentCapturePreferenceController"/>



















    <com.android.settings.widget.MasterSwitchPreference









    <com.android.settings.widget.PrimarySwitchPreference









        android:key="content_capture_custom_settings"









        android:title="@string/content_capture"









        android:summary="@string/content_capture_summary"









        settings:controller="com.android.settings.privacy.EnableContentCaptureWithServiceSettingsPreferenceController">









    </com.android.settings.widget.MasterSwitchPreference>









    </com.android.settings.widget.PrimarySwitchPreference>



















</PreferenceScreen>
























res/xml/storage_dashboard_fragment.xml



+1
−1






























Original line number
Diff line number
Diff line







@@ -24,7 +24,7 @@







        android:order="0"









        settings:searchable="false"









        settings:controller="com.android.settings.deviceinfo.storage.StorageSummaryDonutPreferenceController"/>









    <com.android.settings.widget.MasterSwitchPreference









    <com.android.settings.widget.PrimarySwitchPreference









        android:fragment="com.android.settings.deletionhelper.AutomaticStorageManagerSettings"









        android:key="toggle_asm"









        android:title="@string/automatic_storage_manager_preference_title"