Archives/iceraven-browser
2
0
Fork 0
mirror of https://github.com/fork-maintainers/iceraven-browser synced 2024-11-03 23:15:31 +00:00
Code Issues Releases Wiki Activity

[fenix] Close https://github.com/mozilla-mobile/fenix/issues/21610: Update Strings for Tab Settings

Browse Source
This commit is contained in:
Roger Yang 2021-09-30 18:27:56 -04:00 committed by mergify[bot]
parent 2311ac81df
commit 1da6397453
4 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuTabsRobot.kt
View File

@ -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"))

4
app/src/main/java/org/mozilla/fenix/settings/TabsSettingsFragment.kt
View File

@ -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)

10
app/src/main/res/values/strings.xml
View File

@ -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 -->

3
app/src/main/res/xml/tabs_preferences.xml
View File

@ -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>