Merge "Move hard coded string in all_tether_prefs into string.xml"

This commit is contained in:
Zhen Zhang
2020-02-18 05:41:42 +00:00
committed by Android (Google) Code Review
2 changed files with 7 additions and 2 deletions

View File

@@ -3767,7 +3767,12 @@
<!-- Tethering setting summary when hotspot and tethering are off [CHAR LIMIT=NONE]-->
<string name="tether_settings_summary_off">Not sharing internet with other devices</string>
<!-- Tethering interface options [CHAR LIMIT=NONE]-->
<string name="tethering_interface_options">Tethering</string>
<!-- Disable Wifi Hotspot option-->
<!-- Don't use Wi-Fi hotspot title [CHAR LIMIT=NONE]-->
<string name="disable_wifi_hotspot_title">Don\u2019t use Wi\u2011Fi hotspot</string>
<!-- Don't use Wi-Fi hotspot summary when USB tethering is chosen [CHAR LIMIT=NONE]-->
<string name="disable_wifi_hotspot_when_usb_on">Only share internet via USB</string>
<!-- Don't use Wi-Fi hotspot summary when Bluetooth tethering is chosen [CHAR LIMIT=NONE]-->

View File

@@ -55,7 +55,7 @@
<PreferenceCategory
android:key="tethering_options_group"
android:title="Tethering"
android:title="@string/tethering_interface_options"
settings:searchable="false">
<SwitchPreference
android:key="enable_usb_tethering"
@@ -73,7 +73,7 @@
<SwitchPreference
android:key="disable_wifi_tethering"
android:title="Don't use Wi-Fi hotspot"
android:title="@string/disable_wifi_hotspot_title"
android:summary="@string/summary_placeholder"
settings:controller="com.android.settings.network.WifiTetherDisablePreferenceController"
settings:keywords="@string/keywords_hotspot_tethering" />