From ce46a9674228904ff63ed64a8ca87c89f7a4b458 Mon Sep 17 00:00:00 2001
From: mcarare <mihai.carare.dev@gmail.com>
Date: Mon, 25 May 2020 15:16:45 +0300
Subject: [PATCH] For #10706: Update copy of deleting open tabs preference.

---
 .../ui/robots/SettingsSubMenuDeleteBrowsingDataOnQuitRobot.kt | 2 +-
 .../fenix/ui/robots/SettingsSubMenuDeleteBrowsingDataRobot.kt | 4 ++--
 app/src/main/res/layout/fragment_delete_browsing_data.xml     | 2 +-
 app/src/main/res/values/strings.xml                           | 2 +-
 .../main/res/xml/delete_browsing_data_quit_preferences.xml    | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuDeleteBrowsingDataOnQuitRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuDeleteBrowsingDataOnQuitRobot.kt
index ddc265b00..7e2dfd5af 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuDeleteBrowsingDataOnQuitRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuDeleteBrowsingDataOnQuitRobot.kt
@@ -80,7 +80,7 @@ private fun assertDeleteBrowsingOnQuitButtonSwitchDefault() = onView(withResourc
     .check(matches(isChecked(false)))
 
 private fun assertAllTheCheckBoxesText() {
-    onView(withText(R.string.preferences_delete_browsing_data_tabs_title))
+    onView(withText(R.string.preferences_delete_browsing_data_tabs_title_2))
         .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
 
     onView(withText(R.string.preferences_delete_browsing_data_on_quit_browsing_history))
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuDeleteBrowsingDataRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuDeleteBrowsingDataRobot.kt
index 645ea2da7..32ab7c4f2 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuDeleteBrowsingDataRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuDeleteBrowsingDataRobot.kt
@@ -120,7 +120,7 @@ private fun assertCancelButtonInDialogBox() =
 
 private fun assertAllTheCheckBoxesText() {
 
-    onView(withText(R.string.preferences_delete_browsing_data_tabs_title))
+    onView(withText(R.string.preferences_delete_browsing_data_tabs_title_2))
         .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
 
     onView(withText("0 tabs"))
@@ -149,7 +149,7 @@ private fun assertAllTheCheckBoxesText() {
 }
 
 private fun assertAllTheCheckBoxesChecked() {
-    onView(allOf(withId(R.id.checkbox), hasSibling(withText("Open Tabs")))).assertIsChecked(true)
+    onView(allOf(withId(R.id.checkbox), hasSibling(withText("Open tabs")))).assertIsChecked(true)
 
     onView(allOf(withId(R.id.checkbox), hasSibling(withText("Browsing history and site data")))).assertIsChecked(true)
 
diff --git a/app/src/main/res/layout/fragment_delete_browsing_data.xml b/app/src/main/res/layout/fragment_delete_browsing_data.xml
index ff3d4cbeb..5c5dd8b07 100644
--- a/app/src/main/res/layout/fragment_delete_browsing_data.xml
+++ b/app/src/main/res/layout/fragment_delete_browsing_data.xml
@@ -36,7 +36,7 @@
                 android:background="?android:attr/selectableItemBackground"
                 android:clickable="true"
                 android:focusable="true"
-                app:deleteBrowsingDataItemTitle="@string/preferences_delete_browsing_data_tabs_title"
+                app:deleteBrowsingDataItemTitle="@string/preferences_delete_browsing_data_tabs_title_2"
                 app:deleteBrowsingDataItemSubtitle="@string/preferences_delete_browsing_data_tabs_subtitle" />
             <org.mozilla.fenix.settings.deletebrowsingdata.DeleteBrowsingDataItem
                 android:id="@+id/browsing_data_item"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7301dde35..8c12bab34 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -804,7 +804,7 @@
     <!-- Title for the Delete browsing data preference -->
     <string name="preferences_delete_browsing_data">Delete browsing data</string>
     <!-- Title for the tabs item in Delete browsing data -->
-    <string name="preferences_delete_browsing_data_tabs_title">Open Tabs</string>
+    <string name="preferences_delete_browsing_data_tabs_title_2">Open tabs</string>
     <!-- Subtitle for the tabs item in Delete browsing data, parameter will be replaced with the number of open tabs -->
     <string name="preferences_delete_browsing_data_tabs_subtitle">%d tabs</string>
     <!-- Title for the data and history items in Delete browsing data -->
diff --git a/app/src/main/res/xml/delete_browsing_data_quit_preferences.xml b/app/src/main/res/xml/delete_browsing_data_quit_preferences.xml
index e16db8579..3e09f77b4 100644
--- a/app/src/main/res/xml/delete_browsing_data_quit_preferences.xml
+++ b/app/src/main/res/xml/delete_browsing_data_quit_preferences.xml
@@ -19,7 +19,7 @@
         <CheckBoxPreference
             android:key="@string/pref_key_delete_open_tabs_on_quit"
             android:layout="@layout/delete_browsing_category_checkbox"
-            android:title="@string/preferences_delete_browsing_data_tabs_title" />
+            android:title="@string/preferences_delete_browsing_data_tabs_title_2" />
         <CheckBoxPreference
             android:key="@string/pref_key_delete_browsing_history_on_quit"
             android:layout="@layout/delete_browsing_category_checkbox"