diff --git a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt index 54ad71c5e..b04d4db9e 100644 --- a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt +++ b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt @@ -77,11 +77,6 @@ object FeatureFlags { */ const val showWallpapers = true - /** - * Enables the Contile top sites. - */ - const val contileFeature = true - /** * Enables history improvement features. */ 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 d053025e0..52ac05bfb 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/HomeSettingsFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/HomeSettingsFragment.kt @@ -50,7 +50,6 @@ class HomeSettingsFragment : PreferenceFragmentCompat() { } requirePreference(R.string.pref_key_enable_contile).apply { - isVisible = FeatureFlags.contileFeature isChecked = context.settings().showContileFeature onPreferenceChangeListener = object : SharedPreferenceUpdater() { override fun onPreferenceChange(preference: Preference, newValue: Any?): Boolean { diff --git a/app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt index 945d4be39..10652430e 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt @@ -30,12 +30,6 @@ class SecretSettingsFragment : PreferenceFragmentCompat() { onPreferenceChangeListener = SharedPreferenceUpdater() } - requirePreference(R.string.pref_key_enable_contile).apply { - isVisible = FeatureFlags.contileFeature - isChecked = context.settings().showContileFeature - onPreferenceChangeListener = SharedPreferenceUpdater() - } - requirePreference(R.string.pref_key_allow_third_party_root_certs).apply { isVisible = true isChecked = context.settings().allowThirdPartyRootCerts diff --git a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt index a17efec32..7e1f3b7a3 100644 --- a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt +++ b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt @@ -1270,7 +1270,7 @@ class Settings(private val appContext: Context) : PreferencesHolder { var showContileFeature by lazyFeatureFlagPreference( key = appContext.getPreferenceKey(R.string.pref_key_enable_contile), default = { homescreenSections[HomeScreenSection.CONTILE_TOP_SITES] == true }, - featureFlag = FeatureFlags.contileFeature, + featureFlag = true, ) /** diff --git a/app/src/main/res/values/static_strings.xml b/app/src/main/res/values/static_strings.xml index 77f265585..d1c0ad2ae 100644 --- a/app/src/main/res/values/static_strings.xml +++ b/app/src/main/res/values/static_strings.xml @@ -33,8 +33,6 @@ Secret Debug Info Enable Address Autofill - - Enable Contile Use third party CA certificates diff --git a/app/src/main/res/xml/home_preferences.xml b/app/src/main/res/xml/home_preferences.xml index e349ada42..1651fb15f 100644 --- a/app/src/main/res/xml/home_preferences.xml +++ b/app/src/main/res/xml/home_preferences.xml @@ -13,8 +13,7 @@ android:dependency="@string/pref_key_show_top_sites" android:layout="@layout/checkbox_left_sub_preference" android:key="@string/pref_key_enable_contile" - android:title="@string/customize_toggle_contile" - app:isPreferenceVisible="false" /> + android:title="@string/customize_toggle_contile" /> -