Merge "Move hard coded string in all_tether_prefs into string.xml"
This commit is contained in:
@@ -3767,7 +3767,12 @@
|
|||||||
<!-- Tethering setting summary when hotspot and tethering are off [CHAR LIMIT=NONE]-->
|
<!-- 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>
|
<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-->
|
<!-- 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]-->
|
<!-- 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>
|
<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]-->
|
<!-- Don't use Wi-Fi hotspot summary when Bluetooth tethering is chosen [CHAR LIMIT=NONE]-->
|
||||||
|
@@ -55,7 +55,7 @@
|
|||||||
|
|
||||||
<PreferenceCategory
|
<PreferenceCategory
|
||||||
android:key="tethering_options_group"
|
android:key="tethering_options_group"
|
||||||
android:title="Tethering"
|
android:title="@string/tethering_interface_options"
|
||||||
settings:searchable="false">
|
settings:searchable="false">
|
||||||
<SwitchPreference
|
<SwitchPreference
|
||||||
android:key="enable_usb_tethering"
|
android:key="enable_usb_tethering"
|
||||||
@@ -73,7 +73,7 @@
|
|||||||
|
|
||||||
<SwitchPreference
|
<SwitchPreference
|
||||||
android:key="disable_wifi_tethering"
|
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"
|
android:summary="@string/summary_placeholder"
|
||||||
settings:controller="com.android.settings.network.WifiTetherDisablePreferenceController"
|
settings:controller="com.android.settings.network.WifiTetherDisablePreferenceController"
|
||||||
settings:keywords="@string/keywords_hotspot_tethering" />
|
settings:keywords="@string/keywords_hotspot_tethering" />
|
||||||
|
Reference in New Issue
Block a user