commit 789d605bd69af414d0fa9eaba2315b6504629b84 parent ec94943015fd6306d298bc2e7d7570c649f1ce9a Author: Mugurell <Mugurell@users.noreply.github.com> Date: Wed, 12 Nov 2025 08:07:05 +0000 Bug 1991656 - New secret setting for the new dynamic toolbar behaviour r=android-reviewers,skhan Differential Revision: https://phabricator.services.mozilla.com/D266817 Diffstat:
5 files changed, 18 insertions(+), 0 deletions(-)
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 @@ -140,6 +140,12 @@ class SecretSettingsFragment : PreferenceFragmentCompat() { } } + requirePreference<SwitchPreference>(R.string.pref_key_use_scroll_data_for_dynamic_toolbar).apply { + isVisible = Config.channel.isNightlyOrDebug + isChecked = context.settings().useNewDynamicToolbarBehaviour + onPreferenceChangeListener = SharedPreferenceUpdater() + } + requirePreference<SwitchPreference>(R.string.pref_key_enable_address_sync).apply { isVisible = Config.channel.isNightlyOrDebug isChecked = context.settings().isAddressSyncEnabled 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 @@ -1917,6 +1917,10 @@ class Settings(private val appContext: Context) : PreferencesHolder { default = true, ) + var useNewDynamicToolbarBehaviour by booleanPreference( + appContext.getPreferenceKey(R.string.pref_key_use_scroll_data_for_dynamic_toolbar), + default = false, + ) var isSwipeToolbarToSwitchTabsEnabled by booleanPreference( appContext.getPreferenceKey(R.string.pref_key_swipe_toolbar_switch_tabs), default = true, diff --git a/mobile/android/fenix/app/src/main/res/values/preference_keys.xml b/mobile/android/fenix/app/src/main/res/values/preference_keys.xml @@ -196,6 +196,7 @@ <string name="pref_key_tab_strip_show" translatable="false">pref_key_tab_strip_show</string> <string name="pref_key_tab_strip_message" translatable="false">pref_key_tab_strip_message</string> <string name="pref_key_dynamic_toolbar" translatable="false">pref_key_dynamic_toolbar</string> + <string name="pref_key_use_scroll_data_for_dynamic_toolbar" translatable="false">pref_key_use_scroll_data_for_dynamic_toolbar</string> <string name="pref_key_swipe_toolbar_switch_tabs" translatable="false">pref_key_swipe_toolbar_switch_tabs</string> <string name="pref_key_swipe_toolbar_show_tabs" translatable="false">pref_key_swipe_toolbar_show_tabs</string> <string name="pref_key_recent_tabs" translatable="false">pref_key_recent_tabs</string> diff --git a/mobile/android/fenix/app/src/main/res/values/static_strings.xml b/mobile/android/fenix/app/src/main/res/values/static_strings.xml @@ -95,6 +95,8 @@ <string name="preferences_debug_settings_toolbar_customization">Enable Toolbar Customization</string> <!-- Label for a longer description of the redesigned toolbar depending on the composable toolbar feature --> <string name="preferences_debug_settings_toolbar_redesign_summary" translatable="false">This needs the Composable Toolbar feature enabled</string> + <!-- Label for the option of using new scroll data for animating the dynamic toolbar --> + <string name="preferences_debug_settings_use_scroll_data_for_dynamic_toolbar" translatable="false">Animate dynamic toolbars based on website scroll data</string> <!-- Label for a longer description of the redesigned toolbar depending on the redesigned toolbar options feature --> <string name="preferences_debug_settings_toolbar_customization_summary" translatable="false">This needs the Redesigned Toolbar Options feature enabled</string> <!-- Label for toggling Remote Crash Pull --> diff --git a/mobile/android/fenix/app/src/main/res/xml/secret_settings_preferences.xml b/mobile/android/fenix/app/src/main/res/xml/secret_settings_preferences.xml @@ -70,6 +70,11 @@ app:iconSpaceReserved="false" /> <SwitchPreference android:defaultValue="false" + android:key="@string/pref_key_use_scroll_data_for_dynamic_toolbar" + android:title="@string/preferences_debug_settings_use_scroll_data_for_dynamic_toolbar" + app:iconSpaceReserved="false" /> + <SwitchPreference + android:defaultValue="false" android:key="@string/pref_key_allow_settings_search" android:title="@string/preferences_debug_settings_settings_search" app:iconSpaceReserved="false" />