From e0f22a3e3e0eb4c2901807aecb6bcb1002569216 Mon Sep 17 00:00:00 2001
From: Jeff Boek <jeff@jeffboek.com>
Date: Mon, 10 Jun 2019 13:13:10 -0700
Subject: [PATCH] [fenix] For
 https://github.com/mozilla-mobile/fenix/issues/3278 - pin the default search
 engine to the top

---
 .../settings/SearchEngineListPreference.kt    | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/settings/SearchEngineListPreference.kt b/app/src/main/java/org/mozilla/fenix/settings/SearchEngineListPreference.kt
index 7c74d5e848..41bad89588 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/SearchEngineListPreference.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/SearchEngineListPreference.kt
@@ -76,7 +76,14 @@ abstract class SearchEngineListPreference : Preference, CompoundButton.OnChecked
             return
         }
 
-        val defaultSearchEngine =
+        // To get the default search engine we have to pass in a name that doesn't exist
+        // https://github.com/mozilla-mobile/android-components/issues/3344
+        val defaultSearchEngine = context.components.search.searchEngineManager.getDefaultSearchEngine(
+            context,
+            "."
+        )
+
+        val selectedSearchEngine =
             context.components.search.searchEngineManager.getDefaultSearchEngine(
                 context,
                 Settings.getInstance(context).defaultSearchEngineName
@@ -90,17 +97,22 @@ abstract class SearchEngineListPreference : Preference, CompoundButton.OnChecked
             ViewGroup.LayoutParams.WRAP_CONTENT
         )
 
-        for (i in searchEngines.indices) {
-            val engine = searchEngines[i]
+        val setupSearchEngineItem: (Int, SearchEngine) -> Unit = { index, engine ->
             val engineId = engine.identifier
             val engineItem = makeButtonFromSearchEngine(engine, layoutInflater, context.resources)
-            engineItem.id = i
+            engineItem.id = index
             engineItem.tag = engineId
-            if (engineId == defaultSearchEngine) {
+            if (engineId == selectedSearchEngine) {
                 updateDefaultItem(engineItem.radio_button)
             }
             searchEngineGroup!!.addView(engineItem, layoutParams)
         }
+
+        setupSearchEngineItem(0, defaultSearchEngine)
+
+        searchEngines
+            .filter { it.identifier != defaultSearchEngine.identifier }
+            .forEachIndexed(setupSearchEngineItem)
     }
 
     private fun makeButtonFromSearchEngine(