1
0
Fork 0

For #10706: Update copy of deleting open tabs preference.

master
mcarare 2020-05-25 15:16:45 +03:00 committed by Jonathan Almeida
parent 85409e7c6e
commit ce46a96742
5 changed files with 6 additions and 6 deletions

View File

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

View File

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

View File

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

View File

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

View File

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