blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #11229: Update onboarding ETP copy.

master
mcarare 2020-06-05 10:02:21 +03:00 committed by Emily Kager
parent 52c2fdb310
commit a0d9189321
5 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/androidTest/java/org/mozilla/fenix/ui/HomeScreenTest.kt
View File

@ -76,11 +76,11 @@ class HomeScreenTest {
verifyWhatsNewHeader() verifyWhatsNewHeader()
verifyWhatsNewLink() verifyWhatsNewLink()
// Protect yourself // Automatic privacy
scrollToElementByText("Protect yourself") scrollToElementByText("Automatic privacy")
verifyProtectYourselfHeader() verifyAutomaticPrivacyfHeader()
verifyTrackingProtectionToggle() verifyTrackingProtectionToggle()
verifyProtectYourselfText() verifyAutomaticPrivacyText()
/* Check disable due to Firebase failures on Pixel 2 API 28 /* Check disable due to Firebase failures on Pixel 2 API 28
// Choose your theme // Choose your theme

12
app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt
View File

@ -78,9 +78,9 @@ class HomeScreenRobot {
fun verifyDarkThemeDescription() = assertDarkThemeDescription() fun verifyDarkThemeDescription() = assertDarkThemeDescription()
fun verifyAutomaticThemeToggle() = assertAutomaticThemeToggle() fun verifyAutomaticThemeToggle() = assertAutomaticThemeToggle()
fun verifyAutomaticThemeDescription() = assertAutomaticThemeDescription() fun verifyAutomaticThemeDescription() = assertAutomaticThemeDescription()
fun verifyProtectYourselfHeader() = assertProtectYourselfHeader() fun verifyAutomaticPrivacyfHeader() = assertAutomaticPrivacyHeader()
fun verifyTrackingProtectionToggle() = assertTrackingProtectionToggle() fun verifyTrackingProtectionToggle() = assertTrackingProtectionToggle()
fun verifyProtectYourselfText() = assertProtectYourselfText() fun verifyAutomaticPrivacyText() = assertAutomaticPrivacyText()
// What's new elements // What's new elements
fun verifyWhatsNewHeader() = assertWhatsNewHeather() fun verifyWhatsNewHeader() = assertWhatsNewHeather()
@ -593,8 +593,8 @@ private fun assertAutomaticThemeDescription() =
onView(allOf(withText("Automatic"))) onView(allOf(withText("Automatic")))
.check(matches(withEffectiveVisibility(Visibility.VISIBLE))) .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
private fun assertProtectYourselfHeader() = private fun assertAutomaticPrivacyHeader() =
onView(allOf(withText("Protect yourself"))) onView(allOf(withText("Automatic privacy")))
.check(matches(withEffectiveVisibility(Visibility.VISIBLE))) .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
private fun assertTrackingProtectionToggle() = onView( private fun assertTrackingProtectionToggle() = onView(
@ -602,11 +602,11 @@ private fun assertTrackingProtectionToggle() = onView(
) )
.check(matches(withEffectiveVisibility(Visibility.VISIBLE))) .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
private fun assertProtectYourselfText() { private fun assertAutomaticPrivacyText() {
onView( onView(
allOf( allOf(
withText( withText(
"Firefox Preview helps stop websites from tracking you online." "Privacy and security settings block trackers, malware, and companies that follow you."
) )
) )
) )

10
app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingTrackingProtectionViewHolder.kt
View File

@ -26,10 +26,8 @@ class OnboardingTrackingProtectionViewHolder(view: View) : RecyclerView.ViewHold
standardTrackingProtection = view.tracking_protection_standard_option standardTrackingProtection = view.tracking_protection_standard_option
strictTrackingProtection = view.tracking_protection_strict_default strictTrackingProtection = view.tracking_protection_strict_default
val appName = view.context.getString(R.string.app_name)
view.description_text.text = view.context.getString( view.description_text.text = view.context.getString(
R.string.onboarding_tracking_protection_description1, R.string.onboarding_tracking_protection_description_2
appName
) )
trackingProtectionToggle.apply { trackingProtectionToggle.apply {
@ -65,10 +63,10 @@ class OnboardingTrackingProtectionViewHolder(view: View) : RecyclerView.ViewHold
standardTrackingProtection.performClick() standardTrackingProtection.performClick()
} }
val standardTitle = view.context.getString( val standardTitle = view.context.getString(
R.string.onboarding_tracking_protection_standard_button R.string.onboarding_tracking_protection_standard_button_2
) )
val standardSummary = view.context.getString( val standardSummary = view.context.getString(
R.string.onboarding_tracking_protection_standard_button_description R.string.onboarding_tracking_protection_standard_button_description_2
) )
contentDescription = "$standardTitle. $standardSummary" contentDescription = "$standardTitle. $standardSummary"
} }
@ -84,7 +82,7 @@ class OnboardingTrackingProtectionViewHolder(view: View) : RecyclerView.ViewHold
val strictTitle = val strictTitle =
view.context.getString(R.string.onboarding_tracking_protection_strict_button) view.context.getString(R.string.onboarding_tracking_protection_strict_button)
val strictSummary = val strictSummary =
view.context.getString(R.string.onboarding_tracking_protection_strict_button_description) view.context.getString(R.string.onboarding_tracking_protection_strict_button_description_2)
contentDescription = "$strictTitle. $strictSummary" contentDescription = "$strictTitle. $strictSummary"
} }
} }

10
app/src/main/res/layout/onboarding_tracking_protection.xml
View File

@ -16,7 +16,7 @@
android:drawablePadding="12dp" android:drawablePadding="12dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:lines="1" android:lines="1"
android:text="@string/onboarding_tracking_protection_header" android:text="@string/onboarding_tracking_protection_header_2"
android:textAppearance="@style/HeaderTextStyle" android:textAppearance="@style/HeaderTextStyle"
app:layout_constraintEnd_toStartOf="@id/tracking_protection_toggle" app:layout_constraintEnd_toStartOf="@id/tracking_protection_toggle"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@ -43,7 +43,7 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/header_text" app:layout_constraintTop_toBottomOf="@id/header_text"
tools:text="@string/onboarding_tracking_protection_description1" /> tools:text="@string/onboarding_tracking_protection_description_2" />
<View <View
android:id="@+id/clickable_region_standard" android:id="@+id/clickable_region_standard"
@ -74,7 +74,7 @@
android:id="@+id/protection_standard_title" android:id="@+id/protection_standard_title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/onboarding_tracking_protection_standard_button" android:text="@string/onboarding_tracking_protection_standard_button_2"
android:textColor="@color/primary_state_list_text_color" android:textColor="@color/primary_state_list_text_color"
android:textSize="16sp" android:textSize="16sp"
app:layout_constraintStart_toEndOf="@+id/tracking_protection_standard_option" app:layout_constraintStart_toEndOf="@+id/tracking_protection_standard_option"
@ -84,7 +84,7 @@
android:id="@+id/protection_standard_description" android:id="@+id/protection_standard_description"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/onboarding_tracking_protection_standard_button_description" android:text="@string/onboarding_tracking_protection_standard_button_description_2"
android:textColor="@color/secondary_state_list_text_color" android:textColor="@color/secondary_state_list_text_color"
android:textSize="14sp" android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@ -131,7 +131,7 @@
android:id="@+id/protection_strict_description" android:id="@+id/protection_strict_description"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/onboarding_tracking_protection_strict_button_description" android:text="@string/onboarding_tracking_protection_strict_button_description_2"
android:textColor="@color/secondary_state_list_text_color" android:textColor="@color/secondary_state_list_text_color"
android:textSize="14sp" android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"

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

@ -935,20 +935,20 @@
<!-- text to display in the snackbar if automatic sign-in fails. user may try again --> <!-- text to display in the snackbar if automatic sign-in fails. user may try again -->
<string name="onboarding_firefox_account_automatic_signin_failed">Failed to sign-in</string> <string name="onboarding_firefox_account_automatic_signin_failed">Failed to sign-in</string>
<!-- text for the tracking protection onboarding card header --> <!-- text for the tracking protection onboarding card header -->
<string name="onboarding_tracking_protection_header">Protect yourself</string> <string name="onboarding_tracking_protection_header_2">Automatic privacy</string>
<!-- text for the tracking protection card description <!-- text for the tracking protection card description
The first parameter is the name of the app (e.g. Firefox Preview) --> The first parameter is the name of the app (e.g. Firefox Preview) -->
<string name="onboarding_tracking_protection_description1">%s helps stop websites from tracking you online.</string> <string name="onboarding_tracking_protection_description_2">Privacy and security settings block trackers, malware, and companies that follow you.</string>
<!-- text for tracking protection radio button option for standard level of blocking --> <!-- text for tracking protection radio button option for standard level of blocking -->
<string name="onboarding_tracking_protection_standard_button">Standard</string> <string name="onboarding_tracking_protection_standard_button_2">Standard (default)</string>
<!-- text for standard blocking option button description --> <!-- text for standard blocking option button description -->
<string name="onboarding_tracking_protection_standard_button_description">Blocks fewer trackers but allows pages to load normally</string> <string name="onboarding_tracking_protection_standard_button_description_2">Blocks fewer trackers. Pages will load normally.</string>
<!-- text for tracking protection radio button option for strict level of blocking --> <!-- text for tracking protection radio button option for strict level of blocking -->
<string name="onboarding_tracking_protection_strict_button">Strict (recommended)</string> <string name="onboarding_tracking_protection_strict_button">Strict (recommended)</string>
<!-- text for tracking protection radio button option for strict level of blocking --> <!-- text for tracking protection radio button option for strict level of blocking -->
<string name="onboarding_tracking_protection_strict_option">Strict</string> <string name="onboarding_tracking_protection_strict_option">Strict</string>
<!-- text for strict blocking option button description --> <!-- text for strict blocking option button description -->
<string name="onboarding_tracking_protection_strict_button_description">Blocks more trackers for better protection and performance, but may cause some sites to not work properly</string> <string name="onboarding_tracking_protection_strict_button_description_2">Blocks more trackers, ads, and popups. Pages load faster, but some functionality might not work.</string>
<!-- text for the toolbar position card header <!-- text for the toolbar position card header
In English this is an idiom for "choose a side as in an argument or fight" In English this is an idiom for "choose a side as in an argument or fight"
but it is ok to make this more literally about "choosing a position in a physical space --> but it is ok to make this more literally about "choosing a position in a physical space -->