commit 63f4c32db3ccc74d1220d820ae9d758aac7f465e parent 7ba0eee6172add6822b6666eef1a99aa6d4f380e Author: rmalicdem <rmalicdem@mozilla.com> Date: Wed, 10 Dec 2025 19:07:36 +0000 Bug 2005218 - Enable toolbar customization option for all builds r=android-reviewers,Roger Differential Revision: https://phabricator.services.mozilla.com/D275785 Diffstat:
4 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/mobile/android/fenix/app/nimbus.fml.yaml b/mobile/android/fenix/app/nimbus.fml.yaml @@ -837,27 +837,20 @@ features: Whether or not the toolbar redesign option is visible to the user. This allows the user to switch between simple and expanded toolbar. type: Boolean default: true - show-simple-customization: + show-customization: description: > - Whether or not the simple toolbar customization option is visible to the user. - type: Boolean - default: false - show-expanded-customization: - description: > - Whether or not the expanded toolbar customization option is visible to the user. + Whether or not the simple/expanded toolbar customization option is visible to the user. type: Boolean default: false defaults: - channel: developer value: show-options: true - show-simple-customization: false - show-expanded-customization: false + show-customization: false - channel: nightly value: show-options: true - show-simple-customization: false - show-expanded-customization: false + show-customization: false tab-management-enhancements: description: Control the visibility of the tab management enhancements. diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/CustomizationFragment.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/CustomizationFragment.kt @@ -14,7 +14,6 @@ import androidx.preference.Preference import androidx.preference.PreferenceCategory import androidx.preference.PreferenceFragmentCompat import androidx.preference.SwitchPreference -import org.mozilla.fenix.Config import org.mozilla.fenix.FeatureFlags import org.mozilla.fenix.GleanMetrics.AppTheme import org.mozilla.fenix.GleanMetrics.CustomizationSettings @@ -105,14 +104,12 @@ class CustomizationFragment : PreferenceFragmentCompat() { simpleCategory.isVisible = settings.shouldShowToolbarCustomization && - Config.channel.isNightlyOrDebug && settings.shouldUseComposableToolbar && settings.toolbarRedesignEnabled && !isExpandedToolbarEnabled expandedCategory.isVisible = settings.shouldShowToolbarCustomization && - Config.channel.isNightlyOrDebug && settings.shouldUseComposableToolbar && settings.toolbarRedesignEnabled && isExpandedToolbarEnabled diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt @@ -115,7 +115,6 @@ class SecretSettingsFragment : PreferenceFragmentCompat() { } } requirePreference<SwitchPreference>(R.string.pref_key_enable_toolbar_customization).apply { - isVisible = Config.channel.isNightlyOrDebug isChecked = context.settings().shouldShowToolbarCustomization val newOption = context.settings().toolbarRedesignEnabled isEnabled = newOption diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt @@ -1363,7 +1363,7 @@ class Settings( var shouldShowToolbarCustomization by booleanPreference( key = appContext.getPreferenceKey(R.string.pref_key_enable_toolbar_customization), - default = { FxNimbus.features.toolbarRedesignOption.value().showExpandedCustomization }, + default = { FxNimbus.features.toolbarRedesignOption.value().showCustomization }, ) val toolbarPosition: ToolbarPosition