From d6853122456e27cf106d9d26be5859161a1eb6fb Mon Sep 17 00:00:00 2001
From: Paul Hu <paulhu@google.com>
Date: Fri, 20 Mar 2020 09:48:59 +0000
Subject: [PATCH] [TNU1.1] Update tethering notification strings

Update string for no upstream and cellular roaming notification.

Bug: 145629001
Bug: 147818698
Test: atest TetheringTests
Change-Id: I7302cf351b0a9a42ad5a543f61ab084de189f282
Merged-In: I7302cf351b0a9a42ad5a543f61ab084de189f282
(cherry picked from aosp/1261866)
---
 Tethering/res/values-mcc204-mnc04/strings.xml  | 12 ++++++++----
 Tethering/res/values-mcc310-mnc004/strings.xml | 12 ++++++++----
 Tethering/res/values-mcc311-mnc480/strings.xml | 12 ++++++++----
 Tethering/res/values/strings.xml               |  6 +++++-
 4 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/Tethering/res/values-mcc204-mnc04/strings.xml b/Tethering/res/values-mcc204-mnc04/strings.xml
index 6bc2e2aa92..a996b4247a 100644
--- a/Tethering/res/values-mcc204-mnc04/strings.xml
+++ b/Tethering/res/values-mcc204-mnc04/strings.xml
@@ -15,12 +15,16 @@
 -->
 <resources>
     <!-- String for no upstream notification title [CHAR LIMIT=200] -->
-    <string name="no_upstream_notification_title">Tethering &amp; Mobile Hotspot has no internet access</string>
+    <string name="no_upstream_notification_title">Hotspot has no internet</string>
+    <!-- String for no upstream notification title [CHAR LIMIT=200] -->
+    <string name="no_upstream_notification_message">Devices can\u2019t connect to internet</string>
+    <!-- String for cellular roaming notification disable button [CHAR LIMIT=200]  -->
+    <string name="no_upstream_notification_disable_button">Turn off hotspot</string>
 
     <!-- String for cellular roaming notification title [CHAR LIMIT=200]  -->
-    <string name="upstream_roaming_notification_title">Roaming</string>
+    <string name="upstream_roaming_notification_title">Hotspot is on</string>
     <!-- String for cellular roaming notification message [CHAR LIMIT=500]  -->
-    <string name="upstream_roaming_notification_message">You will be charged on a per MB basis for all data sent or received while using this service outside the Verizon Network. Please check our website for current international rates. To minimize charges, visit My Verizon periodically to monitor your usage, check your device settings to confirm which devices are connected, and consider using alternate data connections when available</string>
+    <string name="upstream_roaming_notification_message">Additional charges may apply while roaming</string>
     <!-- String for cellular roaming notification continue button [CHAR LIMIT=200]  -->
     <string name="upstream_roaming_notification_continue_button">Continue</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Tethering/res/values-mcc310-mnc004/strings.xml b/Tethering/res/values-mcc310-mnc004/strings.xml
index 6bc2e2aa92..a996b4247a 100644
--- a/Tethering/res/values-mcc310-mnc004/strings.xml
+++ b/Tethering/res/values-mcc310-mnc004/strings.xml
@@ -15,12 +15,16 @@
 -->
 <resources>
     <!-- String for no upstream notification title [CHAR LIMIT=200] -->
-    <string name="no_upstream_notification_title">Tethering &amp; Mobile Hotspot has no internet access</string>
+    <string name="no_upstream_notification_title">Hotspot has no internet</string>
+    <!-- String for no upstream notification title [CHAR LIMIT=200] -->
+    <string name="no_upstream_notification_message">Devices can\u2019t connect to internet</string>
+    <!-- String for cellular roaming notification disable button [CHAR LIMIT=200]  -->
+    <string name="no_upstream_notification_disable_button">Turn off hotspot</string>
 
     <!-- String for cellular roaming notification title [CHAR LIMIT=200]  -->
-    <string name="upstream_roaming_notification_title">Roaming</string>
+    <string name="upstream_roaming_notification_title">Hotspot is on</string>
     <!-- String for cellular roaming notification message [CHAR LIMIT=500]  -->
-    <string name="upstream_roaming_notification_message">You will be charged on a per MB basis for all data sent or received while using this service outside the Verizon Network. Please check our website for current international rates. To minimize charges, visit My Verizon periodically to monitor your usage, check your device settings to confirm which devices are connected, and consider using alternate data connections when available</string>
+    <string name="upstream_roaming_notification_message">Additional charges may apply while roaming</string>
     <!-- String for cellular roaming notification continue button [CHAR LIMIT=200]  -->
     <string name="upstream_roaming_notification_continue_button">Continue</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Tethering/res/values-mcc311-mnc480/strings.xml b/Tethering/res/values-mcc311-mnc480/strings.xml
index 6bc2e2aa92..a996b4247a 100644
--- a/Tethering/res/values-mcc311-mnc480/strings.xml
+++ b/Tethering/res/values-mcc311-mnc480/strings.xml
@@ -15,12 +15,16 @@
 -->
 <resources>
     <!-- String for no upstream notification title [CHAR LIMIT=200] -->
-    <string name="no_upstream_notification_title">Tethering &amp; Mobile Hotspot has no internet access</string>
+    <string name="no_upstream_notification_title">Hotspot has no internet</string>
+    <!-- String for no upstream notification title [CHAR LIMIT=200] -->
+    <string name="no_upstream_notification_message">Devices can\u2019t connect to internet</string>
+    <!-- String for cellular roaming notification disable button [CHAR LIMIT=200]  -->
+    <string name="no_upstream_notification_disable_button">Turn off hotspot</string>
 
     <!-- String for cellular roaming notification title [CHAR LIMIT=200]  -->
-    <string name="upstream_roaming_notification_title">Roaming</string>
+    <string name="upstream_roaming_notification_title">Hotspot is on</string>
     <!-- String for cellular roaming notification message [CHAR LIMIT=500]  -->
-    <string name="upstream_roaming_notification_message">You will be charged on a per MB basis for all data sent or received while using this service outside the Verizon Network. Please check our website for current international rates. To minimize charges, visit My Verizon periodically to monitor your usage, check your device settings to confirm which devices are connected, and consider using alternate data connections when available</string>
+    <string name="upstream_roaming_notification_message">Additional charges may apply while roaming</string>
     <!-- String for cellular roaming notification continue button [CHAR LIMIT=200]  -->
     <string name="upstream_roaming_notification_continue_button">Continue</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Tethering/res/values/strings.xml b/Tethering/res/values/strings.xml
index 981524e4da..52a16545c2 100644
--- a/Tethering/res/values/strings.xml
+++ b/Tethering/res/values/strings.xml
@@ -38,6 +38,10 @@
 
     <!-- String for no upstream notification title [CHAR LIMIT=200] -->
     <string name="no_upstream_notification_title"></string>
+    <!-- String for no upstream notification message [CHAR LIMIT=200] -->
+    <string name="no_upstream_notification_message"></string>
+    <!-- String for cellular roaming notification disable button [CHAR LIMIT=200]  -->
+    <string name="no_upstream_notification_disable_button"></string>
 
     <!-- String for cellular roaming notification title [CHAR LIMIT=200]  -->
     <string name="upstream_roaming_notification_title"></string>
@@ -45,4 +49,4 @@
     <string name="upstream_roaming_notification_message"></string>
     <!-- String for cellular roaming notification continue button [CHAR LIMIT=200]  -->
     <string name="upstream_roaming_notification_continue_button"></string>
-</resources>
\ No newline at end of file
+</resources>