clairehurst pushed to branch tor-browser-149.0a1-16.0-2 at The Tor Project / Applications / Tor Browser
Commits:
-
2bd95221
by clairehurst at 2026-03-25T15:43:07-06:00
3 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/xml/customization_preferences.xml
Changes:
| ... | ... | @@ -63,7 +63,6 @@ class CustomizationFragment : PreferenceFragmentCompat() { |
| 63 | 63 | setupRadioGroups()
|
| 64 | 64 | val tabletAndTabStripEnabled = Settings(requireContext()).isTabStripEnabled
|
| 65 | 65 | updateToolbarCategoryBasedOnTabStrip(tabletAndTabStripEnabled)
|
| 66 | - setupTabStripCategory()
|
|
| 67 | 66 | updateToolbarShortcut()
|
| 68 | 67 | |
| 69 | 68 | // if tab strip is enabled, swipe toolbar to switch tabs should not be enabled so the
|
| ... | ... | @@ -206,20 +205,6 @@ class CustomizationFragment : PreferenceFragmentCompat() { |
| 206 | 205 | addToRadioGroup(topPreference, bottomPreference)
|
| 207 | 206 | }
|
| 208 | 207 | |
| 209 | - private fun setupTabStripCategory() {
|
|
| 210 | - val tabStripSwitch = requirePreference<SwitchPreference>(R.string.pref_key_tab_strip_show)
|
|
| 211 | - val context = requireContext()
|
|
| 212 | - |
|
| 213 | - tabStripSwitch.isChecked = Settings(requireContext()).isTabStripEnabled
|
|
| 214 | - |
|
| 215 | - tabStripSwitch.setOnPreferenceChangeListener { _, newValue ->
|
|
| 216 | - val enabled = newValue as Boolean
|
|
| 217 | - context.settings().isTabStripEnabled = enabled
|
|
| 218 | - updateToolbarCategoryBasedOnTabStrip(enabled)
|
|
| 219 | - true
|
|
| 220 | - }
|
|
| 221 | - }
|
|
| 222 | - |
|
| 223 | 208 | private fun setupGesturesCategory(isSwipeToolbarToSwitchTabsVisible: Boolean) {
|
| 224 | 209 | requirePreference<SwitchPreference>(R.string.pref_key_website_pull_to_refresh).apply {
|
| 225 | 210 | isVisible = FeatureFlags.PULL_TO_REFRESH_ENABLED
|
| ... | ... | @@ -2038,11 +2038,7 @@ class Settings( |
| 2038 | 2038 | default = { FxNimbus.features.searchOptimizationOption.value().showStocksCard },
|
| 2039 | 2039 | )
|
| 2040 | 2040 | |
| 2041 | - var isTabStripEnabled by booleanPreference(
|
|
| 2042 | - appContext.getPreferenceKey(R.string.pref_key_tab_strip_show),
|
|
| 2043 | - default = FxNimbus.features.tabStrip.value().enabled &&
|
|
| 2044 | - (isTabStripEligible(appContext) || FxNimbus.features.tabStrip.value().allowOnAllDevices),
|
|
| 2045 | - )
|
|
| 2041 | + val isTabStripEnabled = false
|
|
| 2046 | 2042 | |
| 2047 | 2043 | var isDynamicToolbarEnabled = false
|
| 2048 | 2044 |
| ... | ... | @@ -60,15 +60,6 @@ |
| 60 | 60 | android:selectable="false" />
|
| 61 | 61 | </androidx.preference.PreferenceCategory>
|
| 62 | 62 | |
| 63 | - <androidx.preference.PreferenceCategory
|
|
| 64 | - android:layout="@layout/preference_cat_style"
|
|
| 65 | - android:title="@string/preferences_tab_strip"
|
|
| 66 | - app:iconSpaceReserved="false">
|
|
| 67 | - <androidx.preference.SwitchPreference
|
|
| 68 | - android:key="@string/pref_key_tab_strip_show"
|
|
| 69 | - android:title="@string/preference_tab_strip_show" />
|
|
| 70 | - </androidx.preference.PreferenceCategory>
|
|
| 71 | - |
|
| 72 | 63 | <!-- Toolbar shortcut picker -->
|
| 73 | 64 | <androidx.preference.PreferenceCategory
|
| 74 | 65 | android:key="@string/pref_key_customization_category_toolbar_shortcut"
|