For #25111 - Remove contileFeature feature flag

pull/543/head
Gabriel Luong 2 years ago committed by mergify[bot]
parent e0a6a9498d
commit 957d9c487c

@ -77,11 +77,6 @@ object FeatureFlags {
*/
const val showWallpapers = true
/**
* Enables the Contile top sites.
*/
const val contileFeature = true
/**
* Enables history improvement features.
*/

@ -50,7 +50,6 @@ class HomeSettingsFragment : PreferenceFragmentCompat() {
}
requirePreference<CheckBoxPreference>(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 {

@ -30,12 +30,6 @@ class SecretSettingsFragment : PreferenceFragmentCompat() {
onPreferenceChangeListener = SharedPreferenceUpdater()
}
requirePreference<SwitchPreference>(R.string.pref_key_enable_contile).apply {
isVisible = FeatureFlags.contileFeature
isChecked = context.settings().showContileFeature
onPreferenceChangeListener = SharedPreferenceUpdater()
}
requirePreference<SwitchPreference>(R.string.pref_key_allow_third_party_root_certs).apply {
isVisible = true
isChecked = context.settings().allowThirdPartyRootCerts

@ -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,
)
/**

@ -33,8 +33,6 @@
<string name="preferences_debug_info" translatable="false">Secret Debug Info</string>
<!-- Label for enabling Address Autofill -->
<string name="preferences_debug_settings_enable_address_feature" translatable="false">Enable Address Autofill</string>
<!-- Label for enabling Contile feature -->
<string name="preferences_debug_settings_contile_feature" translatable="false">Enable Contile</string>
<!-- Label for allowing third party root certificates from the Android OS CA store preference -->
<string name="preferences_debug_settings_allow_third_party_root_certs">Use third party CA certificates</string>
<!-- Label for a longer description of allowing third party root certificates from the Android OS CA store preference -->

@ -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" />
<androidx.preference.SwitchPreference
android:key="@string/pref_key_recent_tabs"

@ -9,11 +9,6 @@
android:key="@string/pref_key_show_address_feature"
android:title="@string/preferences_debug_settings_enable_address_feature"
app:iconSpaceReserved="false" />
<SwitchPreference
android:defaultValue="false"
android:key="@string/pref_key_enable_contile"
android:title="@string/preferences_debug_settings_contile_feature"
app:iconSpaceReserved="false" />
<SwitchPreference
android:defaultValue="false"
android:key="@string/pref_key_allow_third_party_root_certs"

Loading…
Cancel
Save