From 325d28ae6c07276fdb7ede929478f30b1cb1ec0f Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Tue, 25 Jul 2017 13:25:39 -0700
Subject: [PATCH] Update misc strings

Change-Id: I566e2d08488e8468b9b943418d05fb2d6f669638
Fix: 62069132
Fix: 62265094
Test: visual
---
 res/values/strings.xml                | 9 +++++----
 res/xml/system_dashboard_fragment.xml | 1 +
 res/xml/tether_prefs.xml              | 4 ++--
 res/xml/wifi_tether_settings.xml      | 6 +++---
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 45f572a7392..4d5c35836e9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2040,8 +2040,6 @@
     <string name="wifi_p2p_delete_group_message">Forget this group?</string>
 
     <!-- Wifi AP settings-->
-    <!-- Label for Wifi tether checkbox. Toggles Access Point on/off -->
-    <string name="wifi_tether_checkbox_text">Portable Wi\u2011Fi hotspot</string>
     <!-- Label for Wifi tether checkbox. Toggles Access Point on/off  [CHAR LIMIT=30] -->
     <string name="wifi_hotspot_checkbox_text">Wi\u2011Fi hotspot</string>
     <!-- Summary text when turning hotspot off -->
@@ -2055,13 +2053,13 @@
 
     <!-- Wifi hotspot settings -->
     <!-- Label for Wifi hotspot name. -->
-    <string name="wifi_hotspot_name_title">Wi\u2011Fi name</string>
+    <string name="wifi_hotspot_name_title">Hotspot name</string>
     <!-- Summary for Wifi hotspot name when connection is in progress. -->
     <string name="wifi_hotspot_name_summary_connecting">Turning on <xliff:g id="wifi_hotspot_name">%1$s</xliff:g>...</string>
     <!-- Summary for Wifi hotspot name when connected. -->
     <string name="wifi_hotspot_name_summary_connected">Other devices can connect to <xliff:g id="wifi_hotspot_name">%1$s</xliff:g></string>
     <!-- Label for Wifi hotspot password. -->
-    <string name="wifi_hotspot_password_title">Wi\u2011Fi password</string>
+    <string name="wifi_hotspot_password_title">Hotspot password</string>
     <!-- Label for Wifi hotspot AP Band. -->
     <string name="wifi_hotspot_ap_band_title">AP Band</string>
     <!-- Wifi hotspot footer info for regular hotspot [CHAR LIMIT=NONE]-->
@@ -3114,6 +3112,9 @@
     <!-- Title for a screen containing all device reset options [CHAR LIMIT=50] -->
     <string name="reset_dashboard_title">Reset options</string>
 
+    <!-- Summary text for a screen containing all device reset options [CHAR LIMIT=None] -->
+    <string name="reset_dashboard_summary">Network, apps, or device can be reset</string>
+
     <!-- Reset Network -->
     <!-- Button title to reset Wi-Fi settings, Mobile data setting, bluetooth settings -->
     <string name="reset_network_title">Reset Wi-Fi, mobile &amp; Bluetooth</string>
diff --git a/res/xml/system_dashboard_fragment.xml b/res/xml/system_dashboard_fragment.xml
index 439897183f2..a71c75858c2 100644
--- a/res/xml/system_dashboard_fragment.xml
+++ b/res/xml/system_dashboard_fragment.xml
@@ -57,6 +57,7 @@
     <Preference
         android:key="reset_dashboard"
         android:title="@string/reset_dashboard_title"
+        android:summary="@string/reset_dashboard_summary"
         android:icon="@drawable/ic_restore"
         android:order="-20"
         android:fragment="com.android.settings.system.ResetDashboardFragment" />
diff --git a/res/xml/tether_prefs.xml b/res/xml/tether_prefs.xml
index 709c4251161..549155c39bc 100644
--- a/res/xml/tether_prefs.xml
+++ b/res/xml/tether_prefs.xml
@@ -19,7 +19,7 @@
 
     <Preference
         android:key="wifi_tether"
-        android:title="@string/wifi_tether_checkbox_text"
+        android:title="@string/wifi_hotspot_checkbox_text"
         android:summary="@string/summary_placeholder"
         android:fragment="com.android.settings.wifi.tether.WifiTetherSettings" />
 
@@ -30,7 +30,7 @@
 
     <SwitchPreference
         android:key="enable_wifi_ap"
-        android:title="@string/wifi_tether_checkbox_text"
+        android:title="@string/wifi_hotspot_checkbox_text"
         android:summary="@string/summary_two_lines_placeholder" />
 
     <Preference
diff --git a/res/xml/wifi_tether_settings.xml b/res/xml/wifi_tether_settings.xml
index b83f2f3ad5f..feed2680e80 100644
--- a/res/xml/wifi_tether_settings.xml
+++ b/res/xml/wifi_tether_settings.xml
@@ -19,15 +19,15 @@
 
     <com.android.settings.widget.ValidatedEditTextPreference
         android:key="wifi_tether_network_name"
-        android:title="@string/wifi_ssid"
+        android:title="@string/wifi_hotspot_name_title"
         android:summary="@string/summary_placeholder" />
 
     <com.android.settings.widget.ValidatedEditTextPreference
         android:key="wifi_tether_network_password"
-        android:title="@string/wifi_password" />
+        android:title="@string/wifi_hotspot_password_title" />
 
     <ListPreference
         android:key="wifi_tether_network_ap_band"
-        android:title="@string/wifi_ap_band_config"
+        android:title="@string/wifi_hotspot_ap_band_title"
         android:summary="@string/summary_placeholder" />
 </PreferenceScreen>
\ No newline at end of file