From 7add94ef18d77d2f6aebd9f17ea14c2ce9b46c2d Mon Sep 17 00:00:00 2001 From: Arturo Mejia Date: Wed, 23 Nov 2022 06:10:37 -0500 Subject: [PATCH] [fenix] Disable cookie banner handling by default. --- .../java/org/mozilla/fenix/settings/CookieBannersFragment.kt | 2 +- app/src/main/java/org/mozilla/fenix/utils/Settings.kt | 2 +- app/src/main/res/values/preference_keys.xml | 2 +- app/src/main/res/xml/cookie_banner_preferences.xml | 4 ++-- nimbus.fml.yaml | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/settings/CookieBannersFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/CookieBannersFragment.kt index d9c5d3bebc..56a0d4988a 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/CookieBannersFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/CookieBannersFragment.kt @@ -37,7 +37,7 @@ class CookieBannersFragment : PreferenceFragmentCompat() { } private fun setupPreferences() { - requirePreference(R.string.pref_key_cookie_banner).apply { + requirePreference(R.string.pref_key_cookie_banner_v1).apply { onPreferenceChangeListener = object : SharedPreferenceUpdater() { override fun onPreferenceChange( preference: Preference, diff --git a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt index 7f93500a6a..578fd01943 100644 --- a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt +++ b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt @@ -538,7 +538,7 @@ class Settings(private val appContext: Context) : PreferencesHolder { ) var shouldUseCookieBanner by lazyFeatureFlagPreference( - appContext.getPreferenceKey(R.string.pref_key_cookie_banner), + appContext.getPreferenceKey(R.string.pref_key_cookie_banner_v1), featureFlag = true, default = { cookieBannersSection[CookieBannersSection.FEATURE_SETTING_VALUE] == true }, ) diff --git a/app/src/main/res/values/preference_keys.xml b/app/src/main/res/values/preference_keys.xml index d7f16fc766..fb7297222e 100644 --- a/app/src/main/res/values/preference_keys.xml +++ b/app/src/main/res/values/preference_keys.xml @@ -149,7 +149,7 @@ pref_key_cookie_banner_settings - pref_key_cookie_banner + pref_key_cookie_banner_v1 pref_key_etp_learn_more diff --git a/app/src/main/res/xml/cookie_banner_preferences.xml b/app/src/main/res/xml/cookie_banner_preferences.xml index 4076d31f99..ee77bdade9 100644 --- a/app/src/main/res/xml/cookie_banner_preferences.xml +++ b/app/src/main/res/xml/cookie_banner_preferences.xml @@ -3,8 +3,8 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> diff --git a/nimbus.fml.yaml b/nimbus.fml.yaml index 78a5e2ecea..2e92cfe8f0 100644 --- a/nimbus.fml.yaml +++ b/nimbus.fml.yaml @@ -223,14 +223,14 @@ features: value: { "sections-enabled": { "feature-ui": true, - "feature-setting-value": true, + "feature-setting-value": false, } } - channel: nightly value: { "sections-enabled": { "feature-ui": true, - "feature-setting-value": true, + "feature-setting-value": false, } } unified-search: