diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/ProtectionsView.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/ProtectionsView.kt index cf126a00fc44..533a7d906d79 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/ProtectionsView.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/ProtectionsView.kt @@ -34,6 +34,7 @@ import org.mozilla.fenix.databinding.QuicksettingsProtectionsPanelBinding import org.mozilla.fenix.theme.FirefoxTheme import org.mozilla.fenix.trackingprotection.CookieBannerUIMode import org.mozilla.fenix.trackingprotection.CookieBannerUIMode.REQUEST_UNSUPPORTED_SITE_SUBMITTED +import org.mozilla.fenix.trackingprotection.CookieBannerUIMode.SITE_NOT_SUPPORTED import org.mozilla.fenix.trackingprotection.ProtectionsState import org.mozilla.fenix.utils.Settings @@ -111,6 +112,7 @@ class ProtectionsView( FirefoxTheme { if (cookieBannerMode in listOf( REQUEST_UNSUPPORTED_SITE_SUBMITTED, + SITE_NOT_SUPPORTED, ) ) { CookieBannerItem( diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/CookieBannerHandlingDetailsView.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/CookieBannerHandlingDetailsView.kt index 2bbf852b0dfa..c6328213c48b 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/CookieBannerHandlingDetailsView.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/CookieBannerHandlingDetailsView.kt @@ -102,13 +102,9 @@ class CookieBannerHandlingDetailsView( R.string.reduce_cookie_banner_details_panel_title_on_for_site_1, shortUrl, ) - CookieBannerUIMode.SITE_NOT_SUPPORTED -> { - val appName = context.getString(R.string.app_name) - context.getString( - R.string.cookie_banner_handling_details_site_is_not_supported_title_3, - appName, - ) - } + CookieBannerUIMode.SITE_NOT_SUPPORTED -> context.getString( + R.string.cookie_banner_handling_details_site_is_not_supported_title_2, + ) else -> "" } binding.title.text = title @@ -129,7 +125,8 @@ class CookieBannerHandlingDetailsView( appName, ) CookieBannerUIMode.SITE_NOT_SUPPORTED -> context.getString( - R.string.reduce_cookie_banner_details_panel_title_unsupported_site_request_3, + R.string.reduce_cookie_banner_details_panel_title_unsupported_site_request_2, + appName, ) else -> "" } diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/trackingprotection/ProtectionsStore.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/trackingprotection/ProtectionsStore.kt index 87978cd229ba..4f876e92033f 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/trackingprotection/ProtectionsStore.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/trackingprotection/ProtectionsStore.kt @@ -159,7 +159,7 @@ enum class CookieBannerUIMode( * SITE_NOT_SUPPORTED - The domain is not supported by cookie banner handling. */ SITE_NOT_SUPPORTED( - R.string.reduce_cookie_banner_unsupported_site_1, + R.string.reduce_cookie_banner_unsupported_site, R.drawable.ic_cookies_disabled, ), diff --git a/mobile/android/fenix/app/src/main/res/layout/component_cookie_banner_details_panel.xml b/mobile/android/fenix/app/src/main/res/layout/component_cookie_banner_details_panel.xml index 3673f7451cb1..486bb64b6e96 100644 --- a/mobile/android/fenix/app/src/main/res/layout/component_cookie_banner_details_panel.xml +++ b/mobile/android/fenix/app/src/main/res/layout/component_cookie_banner_details_panel.xml @@ -67,14 +67,14 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:visibility="gone" - android:layout_marginTop="8dp" + android:layout_marginTop="16dp" android:background="@android:color/transparent" android:gravity="center" android:minHeight="48dp" android:text="@string/cookie_banner_handling_details_site_is_not_supported_cancel_button" android:layout_marginEnd="16dp" - android:textAllCaps="false" - android:textColor="@color/accent_high_contrast_private_theme" + android:textAllCaps="true" + android:textColor="@color/fx_mobile_text_color_accent" android:textSize="14sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -85,14 +85,14 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:visibility="gone" - android:layout_marginTop="8dp" + android:layout_marginTop="16dp" android:background="@android:color/transparent" android:gravity="center" android:minHeight="48dp" android:layout_marginEnd="16dp" - android:text="@string/cookie_banner_handling_details_site_is_not_supported_request_support_button_3" - android:textAllCaps="false" - android:textColor="@color/accent_high_contrast_private_theme" + android:text="@string/cookie_banner_handling_details_site_is_not_supported_request_support_button_2" + android:textAllCaps="true" + android:textColor="@color/fx_mobile_text_color_accent" android:textSize="14sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toLeftOf="parent" diff --git a/mobile/android/fenix/app/src/main/res/values/strings.xml b/mobile/android/fenix/app/src/main/res/values/strings.xml index 9c88ebee0d92..2215337b3418 100644 --- a/mobile/android/fenix/app/src/main/res/values/strings.xml +++ b/mobile/android/fenix/app/src/main/res/values/strings.xml @@ -545,13 +545,9 @@ Cancel - Send request - - Ask to add site + Send request - Request support for this site? - - Ask %1$s to auto refuse cookies + Request support for this site? Request sent @@ -559,17 +555,13 @@ Support request sent - Site currently not supported - - Site not supported + Site currently not supported Turn on Cookie Banner Blocker for %1$s? Turn off Cookie Banner Blocker for %1$s? - %1$s can’t automatically reject cookie requests on this site. You can send a request to support this site in the future. - - We can’t auto refuse cookie pop-ups on this site right now. + %1$s can’t automatically reject cookie requests on this site. You can send a request to support this site in the future. Turn off and %1$s will clear cookies and reload this site. This may sign you out or empty shopping carts. diff --git a/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/CookieBannerHandlingDetailsViewTest.kt b/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/CookieBannerHandlingDetailsViewTest.kt index 7e240e43ebc9..5afd82b0f204 100644 --- a/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/CookieBannerHandlingDetailsViewTest.kt +++ b/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/CookieBannerHandlingDetailsViewTest.kt @@ -107,7 +107,6 @@ class CookieBannerHandlingDetailsViewTest { @Test fun `GIVEN cookie banner handling mode is site not supported WHEN biding title THEN title view must have the expected string`() = runTestOnMain { - val appName = testContext.getString(R.string.app_name) coEvery { publicSuffixList.getPublicSuffixPlusOne(any()) } returns CompletableDeferred("mozilla.org") val websiteUrl = "https://mozilla.org" @@ -116,8 +115,7 @@ class CookieBannerHandlingDetailsViewTest { val expectedText = testContext.getString( - R.string.cookie_banner_handling_details_site_is_not_supported_title_3, - appName, + R.string.cookie_banner_handling_details_site_is_not_supported_title_2, ) assertEquals(expectedText, view.binding.title.text) @@ -174,9 +172,11 @@ class CookieBannerHandlingDetailsViewTest { fun `GIVEN cookie banner handling mode is site not supported WHEN biding description THEN description view must have the expected string`() { view.bindDescription(state = CookieBannerUIMode.SITE_NOT_SUPPORTED) + val appName = testContext.getString(R.string.app_name) val expectedText = testContext.getString( - R.string.reduce_cookie_banner_details_panel_title_unsupported_site_request_3, + R.string.reduce_cookie_banner_details_panel_title_unsupported_site_request_2, + appName, ) assertEquals(expectedText, view.binding.details.text)