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 @@
Close tabs
- Manually
+ Never
After one day
@@ -675,11 +675,9 @@
- Inactive tabs on tab tray
-
- Make tabs inactive after 14 days
-
- To improve speed, tabs will be moved into the inactive tabs section on your tab tray
+ Move old tabs to inactive
+
+ Tabs you haven’t viewed for two weeks get moved to the inactive section.
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 @@
+ android:title="@string/preferences_inactive_tabs_title"/>