For mozilla-mobile#220 - Removes feature flag for language picker

boek · Apr 6, 2020 · 940460d · 940460d
1 parent 14649a4
commit 940460d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
@@ -36,9 +36,9 @@ object FeatureFlags {
     val dynamicBottomToolbar = Config.channel.isNightlyOrDebug
 
     /**
-     * Enables the new language picker
+     * Enables deleting individual tracking protection exceptions.
      */
-    val fenixLanguagePicker = Config.channel.isNightlyOrDebug
+    val deleteIndividualTrackingProtectionExceptions = Config.channel.isNightlyOrDebug
 
     /**
      * Integration of push support provided by `feature-push` component into the Gecko engine.

diff --git a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
@@ -31,7 +31,6 @@ import mozilla.components.concept.sync.OAuthAccount
 import mozilla.components.concept.sync.Profile
 import org.mozilla.fenix.BrowserDirection
 import org.mozilla.fenix.Config
-import org.mozilla.fenix.FeatureFlags
 import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.R
 import org.mozilla.fenix.components.metrics.Event
@@ -116,7 +115,6 @@ class SettingsFragment : PreferenceFragmentCompat() {
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         setPreferencesFromResource(R.xml.preferences, rootKey)
-        updatePreferenceVisibilityForFeatureFlags()
     }
 
     override fun onResume() {
@@ -177,12 +175,6 @@ class SettingsFragment : PreferenceFragmentCompat() {
         }
     }
 
-    private fun updatePreferenceVisibilityForFeatureFlags() {
-        findPreference<Preference>(getPreferenceKey(R.string.pref_key_language))?.apply {
-            isVisible = FeatureFlags.fenixLanguagePicker
-        }
-    }
-
     @Suppress("ComplexMethod", "LongMethod")
     override fun onPreferenceTreeClick(preference: Preference): Boolean {
         // Hide the scrollbar so the animation looks smoother