From 5ef644bf46100de697729a9c236eb0c67661f694 Mon Sep 17 00:00:00 2001
From: Zhen Zhang <zzhen@google.com>
Date: Fri, 14 Feb 2020 11:17:50 -0800
Subject: [PATCH] Move hard coded string in all_tether_prefs into string.xml

Moving these title strings in all_tether_prefs.xml into string.xml and
use them.

Bug: 149343162
Test: Manually test.
Change-Id: Ic57fa7e85f4d39ff1cd30e80a35b8c282827b86d
---
 res/values/strings.xml       | 5 +++++
 res/xml/all_tether_prefs.xml | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index f5b19318e04..ce7048b68a3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -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]-->
diff --git a/res/xml/all_tether_prefs.xml b/res/xml/all_tether_prefs.xml
index d16adc5c827..f5525229028 100644
--- a/res/xml/all_tether_prefs.xml
+++ b/res/xml/all_tether_prefs.xml
@@ -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" />