Closes #884 - Set and use default search engine
parent
dc257a09aa
commit
8d442c062d
|
@ -8,6 +8,7 @@ import android.content.Context
|
||||||
import kotlinx.coroutines.GlobalScope
|
import kotlinx.coroutines.GlobalScope
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import mozilla.components.browser.search.SearchEngineManager
|
import mozilla.components.browser.search.SearchEngineManager
|
||||||
|
import org.mozilla.fenix.utils.Settings
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Component group for all search engine integration related functionality.
|
* Component group for all search engine integration related functionality.
|
||||||
|
@ -23,6 +24,10 @@ class Search(private val context: Context) {
|
||||||
GlobalScope.launch {
|
GlobalScope.launch {
|
||||||
load(context).await()
|
load(context).await()
|
||||||
}
|
}
|
||||||
|
defaultSearchEngine = getDefaultSearchEngine(
|
||||||
|
context,
|
||||||
|
Settings.getInstance(context).defaultSearchEngineName
|
||||||
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -112,8 +112,7 @@ class HomeFragment : Fragment() {
|
||||||
})
|
})
|
||||||
|
|
||||||
val searchIcon = requireComponents.search.searchEngineManager.getDefaultSearchEngine(
|
val searchIcon = requireComponents.search.searchEngineManager.getDefaultSearchEngine(
|
||||||
requireContext(),
|
requireContext()
|
||||||
Settings.getInstance(requireContext()).defaultSearchEngineName
|
|
||||||
).let {
|
).let {
|
||||||
BitmapDrawable(resources, it.icon)
|
BitmapDrawable(resources, it.icon)
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,6 +10,7 @@ import android.widget.CompoundButton
|
||||||
import android.widget.RadioGroup
|
import android.widget.RadioGroup
|
||||||
import androidx.preference.PreferenceViewHolder
|
import androidx.preference.PreferenceViewHolder
|
||||||
import org.mozilla.fenix.R
|
import org.mozilla.fenix.R
|
||||||
|
import org.mozilla.fenix.ext.components
|
||||||
import org.mozilla.fenix.utils.Settings
|
import org.mozilla.fenix.utils.Settings
|
||||||
|
|
||||||
class RadioSearchEngineListPreference : SearchEngineListPreference,
|
class RadioSearchEngineListPreference : SearchEngineListPreference,
|
||||||
|
@ -45,6 +46,7 @@ class RadioSearchEngineListPreference : SearchEngineListPreference,
|
||||||
}
|
}
|
||||||
|
|
||||||
val newDefaultEngine = searchEngines[checkedId]
|
val newDefaultEngine = searchEngines[checkedId]
|
||||||
|
context.components.search.searchEngineManager.defaultSearchEngine = newDefaultEngine
|
||||||
Settings.getInstance(group.context).setDefaultSearchEngineByName(newDefaultEngine.name)
|
Settings.getInstance(group.context).setDefaultSearchEngineByName(newDefaultEngine.name)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue