diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuEnhancedTrackingProtectionRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuEnhancedTrackingProtectionRobot.kt index 082acce1c..5998f6d06 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuEnhancedTrackingProtectionRobot.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuEnhancedTrackingProtectionRobot.kt @@ -117,10 +117,10 @@ private fun assertEnhancedTrackingProtectionTextWithSwitchWidget() { } private fun assertEnhancedTrackingProtectionOptions() { - onView(withText("Standard")) + onView(withText("Standard (default)")) .check(matches(withEffectiveVisibility(Visibility.VISIBLE))) - val stdText = "Pages will load normally, but block fewer trackers." + val stdText = "Blocks fewer trackers. Pages will load normally." onView(withText(stdText)) .check(matches(withEffectiveVisibility(Visibility.VISIBLE))) @@ -128,7 +128,7 @@ private fun assertEnhancedTrackingProtectionOptions() { .check(matches(withEffectiveVisibility(Visibility.VISIBLE))) val strictText = - "Stronger tracking protection and faster performance, but some sites may not work properly." + "Blocks more trackers, ads, and popups. Pages load faster, but some functionality might not work." onView(withText(strictText)) .check(matches(withEffectiveVisibility(Visibility.VISIBLE))) @@ -136,7 +136,7 @@ private fun assertEnhancedTrackingProtectionOptions() { .check(matches(withEffectiveVisibility(Visibility.VISIBLE))) val customText = - "Choose which trackers and scripts to block" + "Choose which trackers and scripts to block." onView(withText(customText)) .check(matches(withEffectiveVisibility(Visibility.VISIBLE))) } @@ -158,7 +158,7 @@ private fun assertRadioButtonDefaults() { onView( allOf( withId(org.mozilla.fenix.R.id.radio_button), - hasSibling(withText("Standard")) + hasSibling(withText("Standard (default)")) ) ).assertIsChecked(true) diff --git a/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionMode.kt b/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionMode.kt index 380b431b1..08baeafb0 100644 --- a/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionMode.kt +++ b/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionMode.kt @@ -18,7 +18,7 @@ enum class TrackingProtectionMode( STANDARD( preferenceKey = R.string.pref_key_tracking_protection_standard_option, - titleRes = R.string.preference_enhanced_tracking_protection_standard_option, + titleRes = R.string.preference_enhanced_tracking_protection_standard_default_1, contentDescriptionRes = R.string.preference_enhanced_tracking_protection_standard_info_button ), STRICT( diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 093af2721..01b2d6f0d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1034,31 +1034,21 @@ Learn more - Standard - - Standard (recommended) + Standard (default) - Balanced for protection and performance. - - Pages will load normally, but block fewer trackers. + Blocks fewer trackers. Pages will load normally. What’s blocked by standard tracking protection Strict - - Strict (Default) - Stronger tracking protection and faster performance, but some sites may not work properly. - - Strict (recommended) - - Stronger protection, but may cause some sites or content to break. + Blocks more trackers, ads, and popups. Pages load faster, but some functionality might not work. What’s blocked by strict tracking protection Custom - Choose which trackers and scripts to block + Choose which trackers and scripts to block. What’s blocked by custom tracking protection diff --git a/app/src/main/res/xml/tracking_protection_preferences.xml b/app/src/main/res/xml/tracking_protection_preferences.xml index ef7b43cc7..226f213d1 100644 --- a/app/src/main/res/xml/tracking_protection_preferences.xml +++ b/app/src/main/res/xml/tracking_protection_preferences.xml @@ -18,19 +18,19 @@ android:defaultValue="true" android:dependency="@string/pref_key_tracking_protection" android:key="@string/pref_key_tracking_protection_standard_option" - android:summary="@string/preference_enhanced_tracking_protection_standard_description_2" - android:title="@string/preference_enhanced_tracking_protection_standard_option" /> + android:summary="@string/preference_enhanced_tracking_protection_standard_description_3" + android:title="@string/preference_enhanced_tracking_protection_standard_default_1" />