commit ac633508f290baac3ffb2371eebb1ef40c02ab2f
parent 7486f4c030be94054c31af58218e2f3b39370f12
Author: Mugurell <Mugurell@users.noreply.github.com>
Date: Mon, 27 Oct 2025 14:05:04 +0000
Bug 1996556 - Allow having the expanded toolbar setting visible r=android-reviewers,Roger
The "Toolbar layout" setting from the "Customize" screen can now be made visible
through Nimbus or secret settings on all release channels.
Differential Revision: https://phabricator.services.mozilla.com/D270168
Diffstat:
2 files changed, 1 insertion(+), 2 deletions(-)
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
@@ -212,7 +212,7 @@ class CustomizationFragment : PreferenceFragmentCompat() {
private fun setupToolbarLayout() {
val settings = requireContext().settings()
(requirePreference(R.string.pref_key_customization_category_toolbar_layout) as PreferenceCategory).apply {
- isVisible = Config.channel.isNightlyOrDebug && settings.shouldUseComposableToolbar &&
+ isVisible = settings.shouldUseComposableToolbar &&
settings.toolbarRedesignEnabled && isTallWindow() && !isWideWindow()
}
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
@@ -112,7 +112,6 @@ class SecretSettingsFragment : PreferenceFragmentCompat() {
}
requirePreference<SwitchPreference>(R.string.pref_key_enable_toolbar_redesign).apply {
- isVisible = Config.channel.isNightlyOrDebug
isEnabled = context.settings().shouldUseComposableToolbar
summary = when (context.settings().shouldUseComposableToolbar) {
true -> null