Disable cookie banner handling by default.

fork
Arturo Mejia 2 years ago
parent 415849f09d
commit 9bf17f1a6a

@ -37,7 +37,7 @@ class CookieBannersFragment : PreferenceFragmentCompat() {
} }
private fun setupPreferences() { 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() { onPreferenceChangeListener = object : SharedPreferenceUpdater() {
override fun onPreferenceChange( override fun onPreferenceChange(
preference: Preference, preference: Preference,

@ -538,7 +538,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
) )
var shouldUseCookieBanner by lazyFeatureFlagPreference( var shouldUseCookieBanner by lazyFeatureFlagPreference(
appContext.getPreferenceKey(R.string.pref_key_cookie_banner), appContext.getPreferenceKey(R.string.pref_key_cookie_banner_v1),
featureFlag = true, featureFlag = true,
default = { cookieBannersSection[CookieBannersSection.FEATURE_SETTING_VALUE] == true }, default = { cookieBannersSection[CookieBannersSection.FEATURE_SETTING_VALUE] == true },
) )

@ -149,7 +149,7 @@
<!-- Cookie Banner Reduction Settings--> <!-- 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_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 --> <!-- Tracking Protection Settings -->
<string name="pref_key_etp_learn_more" translatable="false">pref_key_etp_learn_more</string> <string name="pref_key_etp_learn_more" translatable="false">pref_key_etp_learn_more</string>

@ -3,8 +3,8 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<SwitchPreference <SwitchPreference
android:defaultValue="true" android:defaultValue="false"
android:key="@string/pref_key_cookie_banner" android:key="@string/pref_key_cookie_banner_v1"
android:summary="@string/reduce_cookie_banner_summary" android:summary="@string/reduce_cookie_banner_summary"
android:title="@string/reduce_cookie_banner_option" /> android:title="@string/reduce_cookie_banner_option" />
</androidx.preference.PreferenceScreen> </androidx.preference.PreferenceScreen>

@ -223,14 +223,14 @@ features:
value: { value: {
"sections-enabled": { "sections-enabled": {
"feature-ui": true, "feature-ui": true,
"feature-setting-value": true, "feature-setting-value": false,
} }
} }
- channel: nightly - channel: nightly
value: { value: {
"sections-enabled": { "sections-enabled": {
"feature-ui": true, "feature-ui": true,
"feature-setting-value": true, "feature-setting-value": false,
} }
} }
unified-search: unified-search:

Loading…
Cancel
Save