diff --git a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt index 9f3dbf679..ec31eca7e 100644 --- a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt +++ b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt @@ -49,11 +49,6 @@ object FeatureFlags { */ val tabTray = Config.channel.isNightlyOrDebug - /** - * Enables new voice search feature - */ - val voiceSearch = Config.channel.isNightlyOrDebug - /** * Allows search widget CFR to be displayed. * This is a placeholder for the experimentation framework determining cohorts. diff --git a/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt b/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt index 9cc3757c9..f263814a0 100644 --- a/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt @@ -43,7 +43,6 @@ import mozilla.components.support.ktx.android.content.isPermissionGranted import mozilla.components.support.ktx.android.view.hideKeyboard import mozilla.components.ui.autocomplete.InlineAutocompleteEditText import org.mozilla.fenix.BrowserDirection -import org.mozilla.fenix.FeatureFlags import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.R import org.mozilla.fenix.components.StoreProvider @@ -148,10 +147,7 @@ class SearchFragment : Fragment(), UserInteractionHandler { BrowserToolbar.Button( ContextCompat.getDrawable(requireContext(), R.drawable.ic_microphone)!!, requireContext().getString(R.string.voice_search_content_description), - visible = { - requireContext().settings().shouldShowVoiceSearch && - FeatureFlags.voiceSearch && speechIsAvailable() - }, + visible = { requireContext().settings().shouldShowVoiceSearch && speechIsAvailable() }, listener = ::launchVoiceSearch ) ) diff --git a/app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineFragment.kt index ad0dcf090..3b2b7ebfa 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineFragment.kt @@ -10,7 +10,6 @@ import androidx.preference.CheckBoxPreference import androidx.preference.Preference import androidx.preference.PreferenceFragmentCompat import androidx.preference.SwitchPreference -import org.mozilla.fenix.FeatureFlags import org.mozilla.fenix.R import org.mozilla.fenix.ext.getPreferenceKey import org.mozilla.fenix.ext.settings @@ -63,7 +62,6 @@ class SearchEngineFragment : PreferenceFragmentCompat() { val showVoiceSearchPreference = findPreference(getPreferenceKey(R.string.pref_key_show_voice_search))?.apply { - isVisible = FeatureFlags.voiceSearch isChecked = context.settings().shouldShowVoiceSearch }