blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #1216: Remove feature flag for voice search

master
Sawyer Blatz 2020-05-29 13:06:54 -07:00 committed by Emily Kager
parent ef40710404
commit 82facbfa00
3 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
View File

@ -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.

6
app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt
View File

@ -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
)
)

2
app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineFragment.kt
View File

@ -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<SwitchPreference>(getPreferenceKey(R.string.pref_key_show_voice_search))?.apply {
isVisible = FeatureFlags.voiceSearch
isChecked = context.settings().shouldShowVoiceSearch
}