Matthew Finkel pushed to branch tor-browser-81.1.1-10.0-1 at The Tor Project / Applications / fenix
Commits:
-
04c2a951
by Alex Catarineu at 2020-09-30T19:48:53+02:00
-
294a617b
by Matthew Finkel at 2020-09-30T21:36:52+00:00
2 changed files:
- app/src/main/java/org/mozilla/fenix/components/searchengine/FenixSearchEngineProvider.kt
- app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineListPreference.kt
Changes:
| ... | ... | @@ -26,7 +26,6 @@ import org.mozilla.fenix.BuildConfig |
| 26 | 26 |
import org.mozilla.fenix.Config
|
| 27 | 27 |
import org.mozilla.fenix.ext.components
|
| 28 | 28 |
import org.mozilla.fenix.ext.settings
|
| 29 |
-import java.util.Locale
|
|
| 30 | 29 |
|
| 31 | 30 |
@SuppressWarnings("TooManyFunctions")
|
| 32 | 31 |
open class FenixSearchEngineProvider(
|
| ... | ... | @@ -112,7 +111,7 @@ open class FenixSearchEngineProvider( |
| 112 | 111 |
engineList.copy(
|
| 113 | 112 |
list = engineList.list.filter {
|
| 114 | 113 |
installedIdentifiers.contains(it.identifier)
|
| 115 |
- }.sortedBy { it.name.toLowerCase(Locale.getDefault()) },
|
|
| 114 |
+ },
|
|
| 116 | 115 |
default = engineList.default?.let {
|
| 117 | 116 |
if (installedIdentifiers.contains(it.identifier)) {
|
| 118 | 117 |
it
|
| ... | ... | @@ -32,7 +32,6 @@ import org.mozilla.fenix.ext.components |
| 32 | 32 |
import org.mozilla.fenix.ext.getRootView
|
| 33 | 33 |
import org.mozilla.fenix.ext.settings
|
| 34 | 34 |
import org.mozilla.fenix.utils.allowUndo
|
| 35 |
-import java.util.Locale
|
|
| 36 | 35 |
|
| 37 | 36 |
abstract class SearchEngineListPreference @JvmOverloads constructor(
|
| 38 | 37 |
context: Context,
|
| ... | ... | @@ -116,7 +115,6 @@ abstract class SearchEngineListPreference @JvmOverloads constructor( |
| 116 | 115 |
|
| 117 | 116 |
searchEngineList.list
|
| 118 | 117 |
.filter { it.identifier != searchEngineList.default?.identifier }
|
| 119 |
- .sortedBy { it.name.toLowerCase(Locale.getDefault()) }
|
|
| 120 | 118 |
.forEachIndexed(setupSearchEngineItem)
|
| 121 | 119 |
}
|
| 122 | 120 |
|