clairehurst pushed to branch tor-browser-148.0a1-16.0-2 at The Tor Project / Applications / Tor Browser
Commits:
-
f35a834a
by clairehurst at 2026-02-26T19:58:28-07:00
4 changed files:
- mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/CustomizationFragment.kt
- mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
- mobile/android/fenix/app/src/main/res/values/preference_keys.xml
- mobile/android/fenix/app/src/main/res/xml/customization_preferences.xml
Changes:
| ... | ... | @@ -256,10 +256,6 @@ class CustomizationFragment : PreferenceFragmentCompat() { |
| 256 | 256 | isChecked = context.settings().isPullToRefreshEnabledInBrowser
|
| 257 | 257 | onPreferenceChangeListener = SharedPreferenceUpdater()
|
| 258 | 258 | }
|
| 259 | - requirePreference<SwitchPreference>(R.string.pref_key_dynamic_toolbar).apply {
|
|
| 260 | - isChecked = context.settings().isDynamicToolbarEnabled
|
|
| 261 | - onPreferenceChangeListener = SharedPreferenceUpdater()
|
|
| 262 | - }
|
|
| 263 | 259 | requirePreference<SwitchPreference>(R.string.pref_key_swipe_toolbar_switch_tabs).apply {
|
| 264 | 260 | isChecked = context.settings().isSwipeToolbarToSwitchTabsEnabled
|
| 265 | 261 | isVisible = isSwipeToolbarToSwitchTabsVisible
|
| ... | ... | @@ -278,9 +274,6 @@ class CustomizationFragment : PreferenceFragmentCompat() { |
| 278 | 274 | resources.getString(R.string.pref_key_website_pull_to_refresh) -> {
|
| 279 | 275 | PullToRefreshInBrowser.enabled.set(requireContext().settings().isPullToRefreshEnabledInBrowser)
|
| 280 | 276 | }
|
| 281 | - resources.getString(R.string.pref_key_dynamic_toolbar) -> {
|
|
| 282 | - CustomizationSettings.dynamicToolbar.set(requireContext().settings().isDynamicToolbarEnabled)
|
|
| 283 | - }
|
|
| 284 | 277 | }
|
| 285 | 278 | return super.onPreferenceTreeClick(preference)
|
| 286 | 279 | }
|
| ... | ... | @@ -2033,10 +2033,7 @@ class Settings( |
| 2033 | 2033 | (isTabStripEligible(appContext) || FxNimbus.features.tabStrip.value().allowOnAllDevices),
|
| 2034 | 2034 | )
|
| 2035 | 2035 | |
| 2036 | - var isDynamicToolbarEnabled by booleanPreference(
|
|
| 2037 | - appContext.getPreferenceKey(R.string.pref_key_dynamic_toolbar),
|
|
| 2038 | - default = true,
|
|
| 2039 | - )
|
|
| 2036 | + var isDynamicToolbarEnabled = false
|
|
| 2040 | 2037 | |
| 2041 | 2038 | var useNewDynamicToolbarBehaviour by booleanPreference(
|
| 2042 | 2039 | appContext.getPreferenceKey(R.string.pref_key_use_scroll_data_for_dynamic_toolbar),
|
| ... | ... | @@ -203,7 +203,6 @@ |
| 203 | 203 | <string name="pref_key_website_pull_to_refresh" translatable="false">pref_key_website_pull_to_refresh</string>
|
| 204 | 204 | <string name="pref_key_tab_strip_show" translatable="false">pref_key_tab_strip_show</string>
|
| 205 | 205 | <string name="pref_key_tab_strip_message" translatable="false">pref_key_tab_strip_message</string>
|
| 206 | - <string name="pref_key_dynamic_toolbar" translatable="false">pref_key_dynamic_toolbar</string>
|
|
| 207 | 206 | <string name="pref_key_use_scroll_data_for_dynamic_toolbar" translatable="false">pref_key_use_scroll_data_for_dynamic_toolbar</string>
|
| 208 | 207 | <string name="pref_key_swipe_toolbar_switch_tabs" translatable="false">pref_key_swipe_toolbar_switch_tabs</string>
|
| 209 | 208 | <string name="pref_key_swipe_toolbar_show_tabs" translatable="false">pref_key_swipe_toolbar_show_tabs</string>
|
| ... | ... | @@ -98,9 +98,6 @@ |
| 98 | 98 | android:key="@string/pref_key_website_pull_to_refresh"
|
| 99 | 99 | android:title="@string/preference_gestures_website_pull_to_refresh"
|
| 100 | 100 | app:isPreferenceVisible="false" />
|
| 101 | - <androidx.preference.SwitchPreference
|
|
| 102 | - android:key="@string/pref_key_dynamic_toolbar"
|
|
| 103 | - android:title="@string/preference_gestures_dynamic_toolbar" />
|
|
| 104 | 101 | <androidx.preference.SwitchPreference
|
| 105 | 102 | android:key="@string/pref_key_swipe_toolbar_switch_tabs"
|
| 106 | 103 | android:title="@string/preference_gestures_swipe_toolbar_switch_tabs_2" />
|