Commit ce46a967 authored by mcarare's avatar mcarare Committed by Jonathan Almeida
Browse files

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

parent 85409e7c

app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuDeleteBrowsingDataOnQuitRobot.kt

+1 −1
Original line number Diff line number Diff line
@@ -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))

app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuDeleteBrowsingDataRobot.kt

+2 −2
Original line number Diff line number Diff line
@@ -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)

app/src/main/res/layout/fragment_delete_browsing_data.xml

+1 −1
Original line number Diff line number Diff line
@@ -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"

app/src/main/res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -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 -->

app/src/main/res/xml/delete_browsing_data_quit_preferences.xml

+1 −1
Original line number Diff line number Diff line
@@ -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"