TB 44752: [android] Remove new expanded toolbar option (f76212a0) · Commits · The Tor Project / Applications / Tor Browser

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

+0 −29

Original line number	Diff line number	Diff line
		@@ -102,7 +102,6 @@ class CustomizationFragment : PreferenceFragmentCompat(), SystemInsetsPaddedFrag
		val tabletAndTabStripEnabled = Settings(requireContext()).isTabStripEnabled
		updateToolbarCategoryBasedOnTabStrip(tabletAndTabStripEnabled)
		setupTabStripCategory()
		setupToolbarLayout()
		updateToolbarShortcut()

		// if tab strip is enabled, swipe toolbar to switch tabs should not be enabled so the
		@@ -249,8 +248,6 @@ class CustomizationFragment : PreferenceFragmentCompat(), SystemInsetsPaddedFrag
		Position.TOP.name,
		),
		)

		updateToolbarLayoutIcons()
		}

		val bottomPreference = requirePreference<RadioButtonPreference>(R.string.pref_key_toolbar_bottom)
		@@ -260,8 +257,6 @@ class CustomizationFragment : PreferenceFragmentCompat(), SystemInsetsPaddedFrag
		Position.BOTTOM.name,
		),
		)

		updateToolbarLayoutIcons()
		}

		val toolbarPosition = requireComponents.settings.toolbarPosition
		@@ -281,33 +276,10 @@ class CustomizationFragment : PreferenceFragmentCompat(), SystemInsetsPaddedFrag
		val enabled = newValue as Boolean
		context.components.settings.isTabStripEnabled = enabled
		updateToolbarCategoryBasedOnTabStrip(enabled)
		setupToolbarLayout()
		true
		}
		}

		private fun setupToolbarLayout() {
		(requirePreference(R.string.pref_key_customization_category_toolbar_layout) as PreferenceCategory).apply {
		isVisible = isTallWindow() && !isWideWindow()
		}

		val layoutToggle = requirePreference<ToggleRadioButtonPreference>(R.string.pref_key_toolbar_expanded)
		layoutToggle.setOnToggleChanged {
		updateToolbarShortcut()
		}
		updateToolbarLayoutIcons()
		}

		private fun updateToolbarLayoutIcons() {
		(requirePreference(R.string.pref_key_toolbar_expanded) as ToggleRadioButtonPreference).apply {
		if (requireComponents.settings.shouldUseBottomToolbar) {
		updateIcon(R.drawable.ic_toolbar_bottom_expanded, R.drawable.ic_toolbar_bottom_simple)
		} else {
		updateIcon(R.drawable.ic_toolbar_top_expanded, R.drawable.ic_toolbar_top_simple)
		}
		}
		}

		private fun setupGesturesCategory(
		isSwipeToolbarToSwitchTabsVisible: Boolean,
		isSummarizationEnabled: Boolean,
		@@ -352,7 +324,6 @@ class CustomizationFragment : PreferenceFragmentCompat(), SystemInsetsPaddedFrag

		override fun onConfigurationChanged(newConfig: Configuration) {
		super.onConfigurationChanged(newConfig)
		setupToolbarLayout()
		updateToolbarShortcut()
		}

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

+1 −5

Original line number	Diff line number	Diff line
		@@ -1577,11 +1577,7 @@ class Settings(
		persistDefaultIfNotExists = true,
		)

		var shouldUseExpandedToolbar by booleanPreference(
		key = appContext.getPreferenceKey(R.string.pref_key_toolbar_expanded),
		default = { FxNimbus.features.defaultExpandedToolbar.value().enabled },
		persistDefaultIfNotExists = true,
		)
		var shouldUseExpandedToolbar = false

		val toolbarPosition: ToolbarPosition
		get() = if (isTabStripEnabled) {

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -200,7 +200,6 @@
		<string name="pref_key_toolbar_bottom" translatable="false">pref_key_toolbar_bottom</string>
		<string name="pref_key_toolbar_tab_swipe_cfr">pref_key_should_show_tab_swipe_cfr</string>
		<string name="pref_key_toolbar_has_shown_tab_swipe_cfr">pref_key_has_shown_tab_swipe_cfr</string>
		<string name="pref_key_toolbar_expanded" translatable="false">pref_key_toolbar_expanded</string>

		<!-- App icon settings-->
		<string name="pref_key_app_icon">pref_key_app_icon</string>
		@@ -236,7 +235,6 @@
		<string name="pref_key_privacy_report_tab_manager" translatable="false">pref_key_privacy_report_tab_manager</string>
		<string name="pref_key_customization_bookmarks" translatable="false">pref_key_recent_bookmarks</string>
		<string name="pref_key_customization_category_toolbar" translatable="false">pref_key_customization_category_toolbar</string>
		<string name="pref_key_customization_category_toolbar_layout" translatable="false">pref_key_customization_category_toolbar_layout</string>
		<string name="pref_key_customization_category_app_icon" translatable="false">pref_key_customization_category_app_icon</string>
		<string name="pref_key_customization_category_toolbar_shortcut" translatable="false">pref_key_customization_category_toolbar_shortcut</string>
		<string name="pref_key_toolbar_simple_shortcut" translatable="false">pref_key_toolbar_simple_shortcut</string>

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

+0 −13

Original line number	Diff line number	Diff line
		@@ -70,19 +70,6 @@
		android:title="@string/preference_tab_strip_show" />
		</androidx.preference.PreferenceCategory>

		<androidx.preference.PreferenceCategory
		android:layout="@layout/preference_cat_style"
		android:title="@string/preferences_toolbar_layout"
		android:key="@string/pref_key_customization_category_toolbar_layout"
		android:visible="false"
		app:iconSpaceReserved="false">
		<org.mozilla.fenix.settings.ToggleRadioButtonPreference
		android:key="@string/pref_key_toolbar_expanded"
		app:sharedPreferenceKey="pref_key_toolbar_expanded"
		app:falseOptionTitle="@string/preference_simple_toolbar"
		app:trueOptionTitle="@string/preference_expanded_toolbar" />
		</androidx.preference.PreferenceCategory>

		<!-- Toolbar shortcut picker -->
		<androidx.preference.PreferenceCategory
		android:key="@string/pref_key_customization_category_toolbar_shortcut"