From 9bf17f1a6a7eeb84f28198ae9ad454fa01f3354f Mon Sep 17 00:00:00 2001
From: Arturo Mejia <arturomejiamarmol@gmail.com>
Date: Wed, 23 Nov 2022 06:10:37 -0500
Subject: [PATCH] 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 d9c5d3beb..56a0d4988 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<SwitchPreference>(R.string.pref_key_cookie_banner).apply {
+        requirePreference<SwitchPreference>(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 7f93500a6..578fd0194 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 d7f16fc76..fb7297222 100644
--- a/app/src/main/res/values/preference_keys.xml
+++ b/app/src/main/res/values/preference_keys.xml
@@ -149,7 +149,7 @@
 
     <!-- Cookie Banner Reduction Settings-->
     <string name="pref_key_cookie_banner_settings" translatable="false">pref_key_cookie_banner_settings</string>
-    <string name="pref_key_cookie_banner" translatable="false">pref_key_cookie_banner</string>
+    <string name="pref_key_cookie_banner_v1" translatable="false">pref_key_cookie_banner_v1</string>
 
     <!-- Tracking Protection Settings -->
     <string name="pref_key_etp_learn_more" translatable="false">pref_key_etp_learn_more</string>
diff --git a/app/src/main/res/xml/cookie_banner_preferences.xml b/app/src/main/res/xml/cookie_banner_preferences.xml
index 4076d31f9..ee77bdade 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/. -->
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <SwitchPreference
-        android:defaultValue="true"
-        android:key="@string/pref_key_cookie_banner"
+        android:defaultValue="false"
+        android:key="@string/pref_key_cookie_banner_v1"
         android:summary="@string/reduce_cookie_banner_summary"
         android:title="@string/reduce_cookie_banner_option" />
 </androidx.preference.PreferenceScreen>
diff --git a/nimbus.fml.yaml b/nimbus.fml.yaml
index 78a5e2ece..2e92cfe8f 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: