diff --git a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt index eab79a290..52c61262c 100644 --- a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt +++ b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt @@ -23,11 +23,6 @@ object FeatureFlags { */ val addressesFeature = Config.channel.isNightlyOrDebug - /** - * Enables the Start On Home feature in the settings page. - */ - const val showStartOnHomeSettings = true - /** * Enables the "recent" tabs feature in the home screen. */ diff --git a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt index 5bd270eea..cf1de8685 100644 --- a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt +++ b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt @@ -241,9 +241,7 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity { if (!shouldStartOnHome() && shouldNavigateToBrowserOnColdStart(savedInstanceState)) { navigateToBrowserOnColdStart() } else { - if (FeatureFlags.showStartOnHomeSettings) { - components.analytics.metrics.track(Event.StartOnHomeEnterHomeScreen) - } + components.analytics.metrics.track(Event.StartOnHomeEnterHomeScreen) } Performance.processIntentIfPerformanceTest(intent, this) @@ -1011,9 +1009,6 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity { * links from an external apps should always opened in the [BrowserFragment]. */ fun shouldStartOnHome(intent: Intent? = this.intent): Boolean { - if (!FeatureFlags.showStartOnHomeSettings) { - return false - } return components.strictMode.resetAfter(StrictMode.allowThreadDiskReads()) { // We only want to open on home when users tap the app, // we want to ignore other cases when the app gets open by users clicking on links. diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt index 09c5d801c..2ac43d3e3 100644 --- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt @@ -537,9 +537,7 @@ class HomeFragment : Fragment() { } binding.tabButton.setOnClickListener { - if (FeatureFlags.showStartOnHomeSettings) { - requireComponents.analytics.metrics.track(Event.StartOnHomeOpenTabsTray) - } + requireComponents.analytics.metrics.track(Event.StartOnHomeOpenTabsTray) openTabsTray() } diff --git a/app/src/main/java/org/mozilla/fenix/settings/HomeSettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/HomeSettingsFragment.kt index 8e1dcd848..1b8bb7870 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/HomeSettingsFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/HomeSettingsFragment.kt @@ -5,10 +5,9 @@ package org.mozilla.fenix.settings import android.os.Bundle -import androidx.preference.CheckBoxPreference import androidx.navigation.findNavController +import androidx.preference.CheckBoxPreference import androidx.preference.Preference -import androidx.preference.PreferenceCategory import androidx.preference.PreferenceFragmentCompat import androidx.preference.SwitchPreference import org.mozilla.fenix.FeatureFlags @@ -87,9 +86,6 @@ class HomeSettingsFragment : PreferenceFragmentCompat() { isVisible = FeatureFlags.showWallpapers } - requirePreference(R.string.pref_key_start_on_home_category).isVisible = - FeatureFlags.showStartOnHomeSettings - addToRadioGroup( openingScreenRadioHomepage, openingScreenLastTab, diff --git a/app/src/main/res/values/preference_keys.xml b/app/src/main/res/values/preference_keys.xml index e3fd80a43..c54932adf 100644 --- a/app/src/main/res/values/preference_keys.xml +++ b/app/src/main/res/values/preference_keys.xml @@ -264,7 +264,6 @@ pref_key_start_on_home_after_four_hours pref_key_start_on_home_always pref_key_start_on_home_never - pref_key_start_on_home_category pref_key_camera_permissions_needed pref_key_inactive_tabs_category pref_key_inactive_tabs diff --git a/app/src/main/res/xml/home_preferences.xml b/app/src/main/res/xml/home_preferences.xml index 91caacc48..512b67f22 100644 --- a/app/src/main/res/xml/home_preferences.xml +++ b/app/src/main/res/xml/home_preferences.xml @@ -45,8 +45,6 @@ android:layout="@layout/preference_cat_style" android:title="@string/preferences_opening_screen" app:allowDividerAbove="true" - app:isPreferenceVisible="false" - android:key="pref_key_start_on_home_category" app:iconSpaceReserved="false">