From 479c41236f9ab8ee3805b06ee1300637fbb08cea Mon Sep 17 00:00:00 2001
From: ekager <ekager@mozilla.com>
Date: Mon, 20 Apr 2020 21:48:53 -0700
Subject: [PATCH] [fenix] Closes
 https://github.com/mozilla-mobile/fenix/issues/9928 - Updates private
 browsing text description

---
 .../java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt   | 8 ++++----
 .../viewholders/PrivateBrowsingDescriptionViewHolder.kt   | 2 +-
 app/src/main/res/layout/private_browsing_description.xml  | 2 +-
 app/src/main/res/values/strings.xml                       | 5 ++---
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt
index afab1c7b5a..df004547ca 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt
@@ -552,10 +552,10 @@ private fun assertPrivateSessionHeader() =
     onView(allOf(withText("Private tabs")))
         .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
 
-const val PRIVATE_SESSION_MESSAGE = "Firefox Preview clears your search and browsing history " +
-        "when you quit the app or close all private tabs. While this doesn’t make you anonymous to websites or " +
-        "your internet service provider, it makes it easier to keep what you do online private from anyone else " +
-        "who uses this device."
+const val PRIVATE_SESSION_MESSAGE =
+    "Firefox Preview clears your search and browsing history from private tabs when you close them or quit the app." +
+            " While this doesn't make you anonymous to websites or your internet service provider," +
+            " it makes it easier to keep what you do online from anyone else who uses this device."
 
 private fun assertPrivateSessionMessage(visible: Boolean) =
     onView(allOf(withText(PRIVATE_SESSION_MESSAGE)))
diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/PrivateBrowsingDescriptionViewHolder.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/PrivateBrowsingDescriptionViewHolder.kt
index a271e40bd6..31a1facb12 100644
--- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/PrivateBrowsingDescriptionViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/PrivateBrowsingDescriptionViewHolder.kt
@@ -22,7 +22,7 @@ class PrivateBrowsingDescriptionViewHolder(
         val resources = view.context.resources
         val appName = resources.getString(R.string.app_name)
         view.private_session_description.text = resources.getString(
-            R.string.private_browsing_placeholder_description, appName
+            R.string.private_browsing_placeholder_description_2, appName
         )
         val commonMythsText = view.private_session_common_myths.text.toString()
         val textWithLink = SpannableString(commonMythsText).apply {
diff --git a/app/src/main/res/layout/private_browsing_description.xml b/app/src/main/res/layout/private_browsing_description.xml
index c20b5f0097..446f0e10bc 100644
--- a/app/src/main/res/layout/private_browsing_description.xml
+++ b/app/src/main/res/layout/private_browsing_description.xml
@@ -19,7 +19,7 @@
             android:lineSpacingExtra="6dp"
             android:gravity="center_vertical"
             android:scrollHorizontally="false"
-            tools:text="@string/private_browsing_placeholder_description"
+            tools:text="@string/private_browsing_placeholder_description_2"
             android:textColor="?primaryText"
             android:textSize="14sp" />
     <TextView
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7fb3ec1c0b..e75d45def5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -28,9 +28,8 @@
     <string name="private_browsing_title">You’re in a private session</string>
     <!-- Explanation for private browsing displayed to users on home view when they first enable private mode
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="private_browsing_placeholder_description">
-         %1$s clears your search and browsing history when you quit the app or close all private tabs. While this doesn’t make you anonymous to websites or your internet service provider, it makes it
-        easier to keep what you do online private from anyone else who uses this device.
+    <string name="private_browsing_placeholder_description_2">
+         %1$s clears your search and browsing history from private tabs when you close them or quit the app. While this doesn\'t make you anonymous to websites or your internet service provider, it makes it easier to keep what you do online from anyone else who uses this device.
     </string>
     <string name="private_browsing_common_myths">
        Common myths about private browsing