Verified Commit a44d26ad authored by clairehurst's avatar clairehurst 🌱 Committed by ma1
Browse files

TB 31951: [Android] Disable Scroll to hide toolbar

parent 9b9c8d02

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/CustomizationFragment.kt

+0 −7
Original line number Diff line number Diff line
@@ -327,10 +327,6 @@ class CustomizationFragment : PreferenceFragmentCompat(), SystemInsetsPaddedFrag 
            isChecked = context.settings().isPullToRefreshEnabledInBrowser

            onPreferenceChangeListener = SharedPreferenceUpdater()

        }

        requirePreference<SwitchPreferenceCompat>(R.string.pref_key_dynamic_toolbar).apply {

            isChecked = context.settings().isDynamicToolbarEnabled

            onPreferenceChangeListener = SharedPreferenceUpdater()

        }

        requirePreference<SwitchPreferenceCompat>(R.string.pref_key_swipe_toolbar_switch_tabs).apply {

            isChecked = context.settings().isSwipeToolbarToSwitchTabsEnabled

            isVisible = isSwipeToolbarToSwitchTabsVisible
@@ -365,9 +361,6 @@ class CustomizationFragment : PreferenceFragmentCompat(), SystemInsetsPaddedFrag 
            resources.getString(R.string.pref_key_website_pull_to_refresh) -> {

                PullToRefreshInBrowser.enabled.set(requireContext().settings().isPullToRefreshEnabledInBrowser)

            }

            resources.getString(R.string.pref_key_dynamic_toolbar) -> {

                CustomizationSettings.dynamicToolbar.set(requireContext().settings().isDynamicToolbarEnabled)

            }

        }

        return super.onPreferenceTreeClick(preference)

    }

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt

+1 −4
Original line number Diff line number Diff line
@@ -2176,10 +2176,7 @@ class Settings( 
                (isTabStripEligible(appContext) || FxNimbus.features.tabStrip.value().allowOnAllDevices),

    )



    var isDynamicToolbarEnabled by booleanPreference(

        appContext.getPreferenceKey(R.string.pref_key_dynamic_toolbar),

        default = true,

    )

    var isDynamicToolbarEnabled = false



    var useNewDynamicToolbarBehaviour by booleanPreference(

        appContext.getPreferenceKey(R.string.pref_key_use_scroll_data_for_dynamic_toolbar),

mobile/android/fenix/app/src/main/res/values/preference_keys.xml

+0 −1
Original line number Diff line number Diff line
@@ -221,7 +221,6 @@ 
    <string name="pref_key_website_pull_to_refresh" translatable="false">pref_key_website_pull_to_refresh</string>

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

mobile/android/fenix/app/src/main/res/xml/customization_preferences.xml

+0 −3
Original line number Diff line number Diff line
@@ -98,9 +98,6 @@ 
            android:key="@string/pref_key_website_pull_to_refresh"

            android:title="@string/preference_gestures_website_pull_to_refresh"

            app:isPreferenceVisible="false" />

        <androidx.preference.SwitchPreferenceCompat

            android:key="@string/pref_key_dynamic_toolbar"

            android:title="@string/preference_gestures_dynamic_toolbar" />

        <androidx.preference.SwitchPreferenceCompat

            android:key="@string/pref_key_swipe_toolbar_switch_tabs"

            android:title="@string/preference_gestures_swipe_toolbar_switch_tabs_2" />