Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix special handling of a fake language code "tl"." am: 9fd2af6b32

Browse Source 
am: 30e321b54a

* commit '30e321b54a589d33dc7f2dd7344bef95faaaf83d':
  Fix special handling of a fake language code "tl".
This commit is contained in:
Yohei Yukawa
2015-12-03 19:18:45 +00:00
committed by android-build-merger
parent d295e94dad 30e321b54a
commit d42df4f68e
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/com/android/internal/inputmethod/InputMethodUtils.java
View File

@@ -377,17 +377,17 @@ public class InputMethodUtils {
}
// TODO: Use {@link Locale#toLanguageTag()} and {@link Locale#forLanguageTag(languageTag)}.
String[] localeParams = localeStr.split("_", 3);
if (localeParams.length >= 1 && "tl".equals(localeParams[0])) {
// Convert a locale whose language is "tl" to one whose language is "fil".
// For example, "tl_PH" will get converted to "fil_PH".
// Versions of Android earlier than Lollipop did not support three letter language
// codes, and used "tl" (Tagalog) as the language string for "fil" (Filipino).
// On Lollipop and above, the current three letter version must be used.
localeParams[0] = "fil";
}
// The length of localeStr is guaranteed to always return a 1 <= value <= 3
// because localeStr is not empty.
if (localeParams.length == 1) {
if (localeParams.length >= 1 && "tl".equals(localeParams[0])) {
// Convert a locale whose language is "tl" to one whose language is "fil".
// For example, "tl_PH" will get converted to "fil_PH".
// Versions of Android earlier than Lollipop did not support three letter language
// codes, and used "tl" (Tagalog) as the language string for "fil" (Filipino).
// On Lollipop and above, the current three letter version must be used.
localeParams[0] = "fil";
}
return new Locale(localeParams[0]);
} else if (localeParams.length == 2) {
return new Locale(localeParams[0], localeParams[1]);