Merge remote-tracking branch 'acatgl/40063' into tor-browser-81.1.1-10.0-1

app/src/main/java/org/mozilla/fenix/components/searchengine/FenixSearchEngineProvider.kt

@@ -26,7 +26,6 @@ import org.mozilla.fenix.BuildConfig
 import org.mozilla.fenix.Config
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.settings
-import java.util.Locale
 
 @SuppressWarnings("TooManyFunctions")
 open class FenixSearchEngineProvider(
@@ -112,7 +111,7 @@ open class FenixSearchEngineProvider(
         engineList.copy(
             list = engineList.list.filter {
                 installedIdentifiers.contains(it.identifier)
-            }.sortedBy { it.name.toLowerCase(Locale.getDefault()) },
+            },
             default = engineList.default?.let {
                 if (installedIdentifiers.contains(it.identifier)) {
                     it

app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineListPreference.kt

@@ -32,7 +32,6 @@ import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.getRootView
 import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.utils.allowUndo
-import java.util.Locale
 
 abstract class SearchEngineListPreference @JvmOverloads constructor(
     context: Context,
@@ -116,7 +115,6 @@ abstract class SearchEngineListPreference @JvmOverloads constructor(
 
         searchEngineList.list
             .filter { it.identifier != searchEngineList.default?.identifier }
-            .sortedBy { it.name.toLowerCase(Locale.getDefault()) }
             .forEachIndexed(setupSearchEngineItem)
     }