From 72b332d0828b6f629e6654b4e0bc06b2e517def1 Mon Sep 17 00:00:00 2001
From: Gabriel Luong <gabriel.luong@gmail.com>
Date: Wed, 4 May 2022 13:48:38 -0400
Subject: [PATCH] [fenix] For
 https://github.com/mozilla-mobile/fenix/issues/25111 - Remove contileFeature
 feature flag

---
 .../fenix/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt       | 5 -----
 .../main/java/org/mozilla/fenix/settings/HomeSettingsFragment.kt    | 1 -
 .../main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt  | 6 ------
 .../fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt     | 2 +-
 mobile/android/fenix/app/src/main/res/values/static_strings.xml     | 2 --
 mobile/android/fenix/app/src/main/res/xml/home_preferences.xml      | 3 +--
 .../fenix/app/src/main/res/xml/secret_settings_preferences.xml      | 5 -----
 7 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
index 54ad71c5ebaf..b04d4db9eded 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
@@ -78,11 +78,6 @@ object FeatureFlags {
     const val showWallpapers = true
 
     /**
-     * Enables the Contile top sites.
-     */
-    const val contileFeature = true
-
-    /**
      * Enables history improvement features.
      */
     const val historyImprovementFeatures = true
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/HomeSettingsFragment.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/HomeSettingsFragment.kt
index d053025e0e19..52ac05bfb22e 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/HomeSettingsFragment.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/HomeSettingsFragment.kt
@@ -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 {
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt
index 945d4be39302..10652430ed90 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt
@@ -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
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
index a17efec3264c..7e1f3b7a3320 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
+++ b/mobile/android/fenix/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/mobile/android/fenix/app/src/main/res/values/static_strings.xml b/mobile/android/fenix/app/src/main/res/values/static_strings.xml
index 77f265585342..d1c0ad2ae1a0 100644
--- a/mobile/android/fenix/app/src/main/res/values/static_strings.xml
+++ b/mobile/android/fenix/app/src/main/res/values/static_strings.xml
@@ -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 -->
diff --git a/mobile/android/fenix/app/src/main/res/xml/home_preferences.xml b/mobile/android/fenix/app/src/main/res/xml/home_preferences.xml
index e349ada42826..1651fb15fd0d 100644
--- a/mobile/android/fenix/app/src/main/res/xml/home_preferences.xml
+++ b/mobile/android/fenix/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" />
 
     <androidx.preference.SwitchPreference
         android:key="@string/pref_key_recent_tabs"
diff --git a/mobile/android/fenix/app/src/main/res/xml/secret_settings_preferences.xml b/mobile/android/fenix/app/src/main/res/xml/secret_settings_preferences.xml
index b9ade62bba27..0b0ce480ec06 100644
--- a/mobile/android/fenix/app/src/main/res/xml/secret_settings_preferences.xml
+++ b/mobile/android/fenix/app/src/main/res/xml/secret_settings_preferences.xml
@@ -11,11 +11,6 @@
         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"
         android:title="@string/preferences_debug_settings_allow_third_party_root_certs"
         android:summary="@string/preferences_debug_settings_allow_third_party_root_certs_summary"
-- 
2.11.4.GIT