diff options
| author | Joshua Imbriani <joshimbriani@google.com> | 2019-07-11 20:28:21 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-07-11 20:28:21 +0000 |
| commit | 3a117e677103f6e1b43626f4658246ac4915f75c (patch) | |
| tree | fc149ccbc9dfe695cf27723fac45ecbba5974f0c /src/com/android/settings/tts | |
| parent | 974d986bb79b8721ac30a2edce647683c3b8ee3f (diff) | |
| parent | 7d6263a38daf3a9b80229811687d4703793ee86d (diff) | |
| download | packages_apps_Settings-3a117e677103f6e1b43626f4658246ac4915f75c.tar.gz packages_apps_Settings-3a117e677103f6e1b43626f4658246ac4915f75c.tar.bz2 packages_apps_Settings-3a117e677103f6e1b43626f4658246ac4915f75c.zip | |
Merge "Correcting sort order of languages for non en-us locales"
Diffstat (limited to 'src/com/android/settings/tts')
| -rw-r--r-- | src/com/android/settings/tts/TextToSpeechSettings.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/com/android/settings/tts/TextToSpeechSettings.java b/src/com/android/settings/tts/TextToSpeechSettings.java index 325370ff44..b4ff0f42e6 100644 --- a/src/com/android/settings/tts/TextToSpeechSettings.java +++ b/src/com/android/settings/tts/TextToSpeechSettings.java @@ -53,6 +53,7 @@ import com.android.settings.widget.SeekBarPreference; import com.android.settingslib.search.SearchIndexable; import com.android.settingslib.widget.ActionButtonsPreference; +import java.text.Collator; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -521,8 +522,12 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment } } - // Sort it - Collections.sort(entryPairs, (lhs, rhs) -> lhs.first.compareToIgnoreCase(rhs.first)); + // Get the primary locale and create a Collator to sort the strings + Locale userLocale = getResources().getConfiguration().getLocales().get(0); + Collator collator = Collator.getInstance(userLocale); + + // Sort the list + Collections.sort(entryPairs, (lhs, rhs) -> collator.compare(lhs.first, rhs.first)); // Get two arrays out of one of pairs mSelectedLocaleIndex = 0; // Will point to the R.string.tts_lang_use_system value |