Archives/iceraven-browser
2
0
Fork 0
mirror of https://github.com/fork-maintainers/iceraven-browser synced 2024-11-17 15:26:23 +00:00
Code Issues Releases Wiki Activity

[fenix] Disable cookie banner handling by default.

Browse Source
This commit is contained in:
Arturo Mejia 2022-11-23 06:10:37 -05:00
parent a23c0d53c2
commit 7add94ef18
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/mozilla/fenix/settings/CookieBannersFragment.kt
View File

@ -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,

2
app/src/main/java/org/mozilla/fenix/utils/Settings.kt
View File

@ -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 },
)

2
app/src/main/res/values/preference_keys.xml
View File

@ -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>

4
app/src/main/res/xml/cookie_banner_preferences.xml
View File

@ -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>

4
nimbus.fml.yaml
View File

@ -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: