diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt index 4b6cf36f7..e4e604534 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt @@ -593,14 +593,14 @@ private fun assertWelcomeHeader() = assertTrue( mDevice.findObject( UiSelector().textContains( - getStringResource(R.string.onboarding_header) + getStringResource(R.string.onboarding_header_2) ) ).waitForExists(waitingTime) ) private fun assertStartSyncHeader() { scrollToElementByText(STRING_ONBOARDING_ACCOUNT_SIGN_IN_HEADER) - onView(allOf(withText(R.string.onboarding_account_sign_in_header_1))) + onView(allOf(withText(R.string.onboarding_account_sign_in_header))) .check(matches(withEffectiveVisibility(Visibility.VISIBLE))) } private fun assertAccountsSignInButton() = @@ -664,7 +664,7 @@ private fun assertAlwaysPrivacyText() { onView( allOf( withText( - "$appName automatically stops companies from secretly following you around the web." + "Featuring Total Cookie Protection to stop trackers from using cookies to stalk you across sites." ) ) ) @@ -672,17 +672,17 @@ private fun assertAlwaysPrivacyText() { } private fun assertYourPrivacyHeader() { - scrollToElementByText("Your privacy") - onView(allOf(withText("Your privacy"))) + scrollToElementByText("You control your data") + onView(allOf(withText("You control your data"))) .check(matches(withEffectiveVisibility(Visibility.VISIBLE))) } private fun assertYourPrivacyText() { - scrollToElementByText("Your privacy") + scrollToElementByText("You control your data") onView( allOf( withText( - "We’ve designed $appName to give you control over what you share online and what you share with us." + "Firefox gives you control over what you share online and what you share with us." ) ) ) @@ -690,7 +690,7 @@ private fun assertYourPrivacyText() { } private fun assertPrivacyNoticeButton() { - scrollToElementByText("Your privacy") + scrollToElementByText("You control your data") onView(allOf(withText("Read our privacy notice"))) .check(matches(withEffectiveVisibility(Visibility.VISIBLE))) } diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/util/Strings.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/util/Strings.kt index 61973d970..4e92643b3 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/util/Strings.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/util/Strings.kt @@ -4,8 +4,8 @@ package org.mozilla.fenix.ui.util -const val STRING_ONBOARDING_ACCOUNT_SIGN_IN_HEADER = "Sync Firefox between devices" -const val STRING_ONBOARDING_TRACKING_PROTECTION_HEADER = "Always-on privacy" +const val STRING_ONBOARDING_ACCOUNT_SIGN_IN_HEADER = "Pick up where you left off" +const val STRING_ONBOARDING_TRACKING_PROTECTION_HEADER = "Privacy protection by default" const val STRING_ONBOARDING_TOOLBAR_PLACEMENT_HEADER = "Pick your toolbar placement" const val FRENCH_LANGUAGE_HEADER = "Langues" const val FR_SETTINGS = "Paramètres" diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlAdapter.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlAdapter.kt index 5f5c7edfd..0bf3a2aeb 100644 --- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlAdapter.kt +++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlAdapter.kt @@ -424,7 +424,7 @@ class SessionControlAdapter( is OnboardingSectionHeaderViewHolder -> holder.bind( (item as AdapterItem.OnboardingSectionHeader).labelBuilder ) - is OnboardingManualSignInViewHolder -> holder.bind() + is OnboardingManualSignInViewHolder, is RecentlyVisitedViewHolder, is RecentBookmarksViewHolder, is RecentTabViewHolder, diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlView.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlView.kt index 7a9aa0459..b62b42c4d 100644 --- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlView.kt +++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlView.kt @@ -134,7 +134,6 @@ private fun onboardingAdapterItems(onboardingState: OnboardingState): List -