Commit 8e31a67b authored by clairehurst's avatar clairehurst 🌱 Committed by Pier Angelo Vendrame
Browse files

TB 44752 [android]: Remove new expanded toolbar option

parent 5316b86a

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

+0 −31
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
@@ -231,8 +230,6 @@ class CustomizationFragment : PreferenceFragmentCompat(), SystemInsetsPaddedFrag 
                    Position.TOP.name,

                ),

            )



            updateToolbarLayoutIcons()

        }



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

                ),

            )



            updateToolbarLayoutIcons()

        }



        val toolbarPosition = requireContext().settings().toolbarPosition
@@ -263,35 +258,10 @@ class CustomizationFragment : PreferenceFragmentCompat(), SystemInsetsPaddedFrag 
            val enabled = newValue as Boolean

            context.settings().isTabStripEnabled = enabled

            updateToolbarCategoryBasedOnTabStrip(enabled)

            setupToolbarLayout()

            true

        }

    }



    private fun setupToolbarLayout() {

        val settings = requireContext().settings()

        (requirePreference(R.string.pref_key_customization_category_toolbar_layout) as PreferenceCategory).apply {

            isVisible = settings.shouldUseComposableToolbar &&

                    settings.toolbarRedesignEnabled && 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 (requireContext().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,
@@ -338,7 +308,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

+2 −9
Original line number Diff line number Diff line
@@ -1468,11 +1468,7 @@ class Settings( 
        persistDefaultIfNotExists = true,

    )



    var shouldUseExpandedToolbar by booleanPreference(

        key = appContext.getPreferenceKey(R.string.pref_key_toolbar_expanded),

        default = false,

        persistDefaultIfNotExists = true,

    )

    var shouldUseExpandedToolbar = false



    var shouldShowToolbarCustomization by booleanPreference(

        key = appContext.getPreferenceKey(R.string.pref_key_enable_toolbar_customization),
@@ -2249,10 +2245,7 @@ class Settings( 
    /**

     * Indicates if the user has access to the toolbar redesign option in settings.

     */

    var toolbarRedesignEnabled by booleanPreference(

        appContext.getPreferenceKey(R.string.pref_key_enable_toolbar_redesign),

        default = { FxNimbus.features.toolbarRedesignOption.value().showOptions },

    )

    var toolbarRedesignEnabled = false



    /**

     * Indicates if the search bar CFR should be displayed to the user.

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

+0 −2
Original line number Diff line number Diff line
@@ -179,7 +179,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>
@@ -214,7 +213,6 @@ 
    <string name="pref_key_enable_privacy_report" translatable="false">pref_key_enable_privacy_report</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
@@ -69,19 +69,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"