blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #11229: Update settings ETP copy.

master
mcarare 2020-06-05 10:43:15 +03:00 committed by Emily Kager
parent a0d9189321
commit 91c27a023e
4 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuEnhancedTrackingProtectionRobot.kt
View File

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

2
app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionMode.kt
View File

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

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

@ -1034,31 +1034,21 @@
<!-- Text displayed that links to website about enhanced tracking protection -->
<string name="preference_enhanced_tracking_protection_explanation_learn_more">Learn more</string>
<!-- Preference for enhanced tracking protection for the standard protection settings -->
<string name="preference_enhanced_tracking_protection_standard_option">Standard</string>
<!-- Preference for enhanced tracking protection for the standard protection settings -->
<string name="preference_enhanced_tracking_protection_standard">Standard (recommended)</string>
<string name="preference_enhanced_tracking_protection_standard_default_1">Standard (default)</string>
<!-- Preference description for enhanced tracking protection for the standard protection settings -->
<string name="preference_enhanced_tracking_protection_standard_description">Balanced for protection and performance.</string>
<!-- Preference description for enhanced tracking protection for the standard protection settings -->
<string name="preference_enhanced_tracking_protection_standard_description_2">Pages will load normally, but block fewer trackers.</string>
<string name="preference_enhanced_tracking_protection_standard_description_3">Blocks fewer trackers. Pages will load normally.</string>
<!-- Accessibility text for the Standard protection information icon -->
<string name="preference_enhanced_tracking_protection_standard_info_button">What’s blocked by standard tracking protection</string>
<!-- Preference for enhanced tracking protection for the strict protection settings -->
<string name="preference_enhanced_tracking_protection_strict">Strict</string>
<!-- Preference for enhanced tracking protection for the strict protection settings, default setting -->
<string name="preference_enhanced_tracking_protection_strict_default">Strict (Default)</string>
<!-- Preference description for enhanced tracking protection for the strict protection settings -->
<string name="preference_enhanced_tracking_protection_strict_default_description">Stronger tracking protection and faster performance, but some sites may not work properly.</string>
<!-- Preference for enhanced tracking protection for the standard protection settings -->
<string name="preference_enhanced_tracking_protection_strict_recommended">Strict (recommended)</string>
<!-- Preference description for enhanced tracking protection for the strict protection settings -->
<string name="preference_enhanced_tracking_protection_strict_description">Stronger protection, but may cause some sites or content to break.</string>
<string name="preference_enhanced_tracking_protection_strict_description_2">Blocks more trackers, ads, and popups. Pages load faster, but some functionality might not work.</string>
<!-- Accessibility text for the Strict protection information icon -->
<string name="preference_enhanced_tracking_protection_strict_info_button">What’s blocked by strict tracking protection</string>
<!-- Preference for enhanced tracking protection for the custom protection settings -->
<string name="preference_enhanced_tracking_protection_custom">Custom</string>
<!-- Preference description for enhanced tracking protection for the strict protection settings -->
<string name="preference_enhanced_tracking_protection_custom_description">Choose which trackers and scripts to block</string>
<string name="preference_enhanced_tracking_protection_custom_description_2">Choose which trackers and scripts to block.</string>
<!-- Accessibility text for the Strict protection information icon -->
<string name="preference_enhanced_tracking_protection_custom_info_button">What’s blocked by custom tracking protection</string>
<!-- Header for categories that are being blocked by current Enhanced Tracking Protection settings -->

8
app/src/main/res/xml/tracking_protection_preferences.xml
View File

@ -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" />
<org.mozilla.fenix.settings.RadioButtonInfoPreference
android:defaultValue="false"
android:dependency="@string/pref_key_tracking_protection"
android:key="@string/pref_key_tracking_protection_strict_default"
android:summary="@string/preference_enhanced_tracking_protection_strict_default_description"
android:summary="@string/preference_enhanced_tracking_protection_strict_description_2"
android:title="@string/preference_enhanced_tracking_protection_strict" />
<org.mozilla.fenix.settings.RadioButtonInfoPreference
android:defaultValue="false"
android:dependency="@string/pref_key_tracking_protection"
android:key="@string/pref_key_tracking_protection_custom_option"
android:summary="@string/preference_enhanced_tracking_protection_custom_description"
android:summary="@string/preference_enhanced_tracking_protection_custom_description_2"
android:title="@string/preference_enhanced_tracking_protection_custom" />
<CheckBoxPreference
android:defaultValue="true"