From 1da63974536a30396742a6b102704b0ad9e4f19a Mon Sep 17 00:00:00 2001
From: Roger Yang <royang@mozilla.com>
Date: Thu, 30 Sep 2021 18:27:56 -0400
Subject: [PATCH] [fenix] Close
 https://github.com/mozilla-mobile/fenix/issues/21610: Update Strings for Tab
 Settings

---
 .../fenix/ui/robots/SettingsSubMenuTabsRobot.kt        |  4 ----
 .../org/mozilla/fenix/settings/TabsSettingsFragment.kt |  4 ++--
 app/src/main/res/values/strings.xml                    | 10 ++++------
 app/src/main/res/xml/tabs_preferences.xml              |  3 +--
 4 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuTabsRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuTabsRobot.kt
index 405af4bcf8..1ff07f888d 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuTabsRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuTabsRobot.kt
@@ -56,8 +56,6 @@ private fun assertTabViewOptions() {
 private fun assertCloseTabsOptions() {
     closeTabsHeading()
         .check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
-    manuallyToggle()
-        .check(ViewAssertions.matches(ViewMatchers.withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
     afterOneDayToggle()
         .check(ViewAssertions.matches(ViewMatchers.withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
     afterOneWeekToggle()
@@ -73,8 +71,6 @@ private fun assertStartOnHomeOptions() {
         .check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
     alwaysStartOnHomeToggle()
         .check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
-    neverStartOnHomeToggle()
-        .check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
 }
 
 private fun tabViewHeading() = onView(withText("Tab view"))
diff --git a/app/src/main/java/org/mozilla/fenix/settings/TabsSettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/TabsSettingsFragment.kt
index 9a9d3dfe70..fd131a7785 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/TabsSettingsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/TabsSettingsFragment.kt
@@ -60,9 +60,9 @@ class TabsSettingsFragment : PreferenceFragmentCompat() {
         gridRadioButton = requirePreference(R.string.pref_key_tab_view_grid)
 
         radioManual = requirePreference(R.string.pref_key_close_tabs_manually)
-        radioOneDay = requirePreference(R.string.pref_key_close_tabs_after_one_day)
-        radioOneWeek = requirePreference(R.string.pref_key_close_tabs_after_one_week)
         radioOneMonth = requirePreference(R.string.pref_key_close_tabs_after_one_month)
+        radioOneWeek = requirePreference(R.string.pref_key_close_tabs_after_one_week)
+        radioOneDay = requirePreference(R.string.pref_key_close_tabs_after_one_day)
 
         startOnHomeRadioFourHours = requirePreference(R.string.pref_key_start_on_home_after_four_hours)
         startOnHomeRadioAlways = requirePreference(R.string.pref_key_start_on_home_always)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 651aff8353..7bca8c85e5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -647,7 +647,7 @@
     <!-- Title of preference that allows a user to auto close tabs after a specified amount of time -->
     <string name="preferences_close_tabs">Close tabs</string>
     <!-- Option for auto closing tabs that will never auto close tabs, always allows user to manually close tabs -->
-    <string name="close_tabs_manually">Manually</string>
+    <string name="close_tabs_manually">Never</string>
     <!-- Option for auto closing tabs that will auto close tabs after one day -->
     <string name="close_tabs_after_one_day">After one day</string>
     <!-- Option for auto closing tabs that will auto close tabs after one week -->
@@ -675,11 +675,9 @@
 
     <!-- Inactive tabs -->
     <!-- Category header of a preference that allows a user to enable or disable the inactive tabs feature -->
-    <string name="preferences_inactive_tabs">Inactive tabs on tab tray</string>
-    <!-- Title for inactive tabs preference -->
-    <string name="preferences_inactive_tabs_title">Make tabs inactive after 14 days</string>
-    <!-- Summary of inactive tabs preference -->
-    <string name="preferences_inactive_tabs_summary">To improve speed, tabs will be moved into the inactive tabs section on your tab tray</string>
+    <string name="preferences_inactive_tabs">Move old tabs to inactive</string>
+    <!-- Title of inactive tabs preference -->
+    <string name="preferences_inactive_tabs_title">Tabs you haven’t viewed for two weeks get moved to the inactive section.</string>
 
     <!-- Studies -->
     <!-- Title of the remove studies button -->
diff --git a/app/src/main/res/xml/tabs_preferences.xml b/app/src/main/res/xml/tabs_preferences.xml
index 6717a49df2..3a4f01762d 100644
--- a/app/src/main/res/xml/tabs_preferences.xml
+++ b/app/src/main/res/xml/tabs_preferences.xml
@@ -80,7 +80,6 @@
         <SwitchPreference
             android:defaultValue="true"
             android:key="@string/pref_key_inactive_tabs"
-            android:title="@string/preferences_inactive_tabs_title"
-            android:summary="@string/preferences_inactive_tabs_summary"/>
+            android:title="@string/preferences_inactive_tabs_title"/>
     </androidx.preference.PreferenceCategory>
 </androidx.preference.PreferenceScreen>