Closes #884 - Set and use default search engine

This commit is contained in:
Emily Kager 2019-03-12 10:17:15 -07:00 committed by Emily Kager
parent dc257a09aa
commit 8d442c062d
3 changed files with 8 additions and 2 deletions

View File

@ -8,6 +8,7 @@ import android.content.Context
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch
import mozilla.components.browser.search.SearchEngineManager
import org.mozilla.fenix.utils.Settings
/**
* Component group for all search engine integration related functionality.
@ -23,6 +24,10 @@ class Search(private val context: Context) {
GlobalScope.launch {
load(context).await()
}
defaultSearchEngine = getDefaultSearchEngine(
context,
Settings.getInstance(context).defaultSearchEngineName
)
}
}
}

View File

@ -112,8 +112,7 @@ class HomeFragment : Fragment() {
})
val searchIcon = requireComponents.search.searchEngineManager.getDefaultSearchEngine(
requireContext(),
Settings.getInstance(requireContext()).defaultSearchEngineName
requireContext()
).let {
BitmapDrawable(resources, it.icon)
}

View File

@ -10,6 +10,7 @@ import android.widget.CompoundButton
import android.widget.RadioGroup
import androidx.preference.PreferenceViewHolder
import org.mozilla.fenix.R
import org.mozilla.fenix.ext.components
import org.mozilla.fenix.utils.Settings
class RadioSearchEngineListPreference : SearchEngineListPreference,
@ -45,6 +46,7 @@ class RadioSearchEngineListPreference : SearchEngineListPreference,
}
val newDefaultEngine = searchEngines[checkedId]
context.components.search.searchEngineManager.defaultSearchEngine = newDefaultEngine
Settings.getInstance(group.context).setDefaultSearchEngineByName(newDefaultEngine.name)
}
}