Merge "Replace Locale#adjustLanguageCode with its own implementation" am: 81546d66ad
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531680 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib05c4b154b14389a3778d09fdc73e427c1f46bd4
This commit is contained in:
@@ -548,7 +548,24 @@ public class ResourcesImpl {
|
||||
remainder = languageTag.substring(separator);
|
||||
}
|
||||
|
||||
return Locale.adjustLanguageCode(language) + remainder;
|
||||
// No need to convert to lower cases because the language in the return value of
|
||||
// Locale.toLanguageTag has been lower-cased.
|
||||
final String adjustedLanguage;
|
||||
switch(language) {
|
||||
case "id":
|
||||
adjustedLanguage = "in";
|
||||
break;
|
||||
case "yi":
|
||||
adjustedLanguage = "ji";
|
||||
break;
|
||||
case "he":
|
||||
adjustedLanguage = "iw";
|
||||
break;
|
||||
default:
|
||||
adjustedLanguage = language;
|
||||
break;
|
||||
}
|
||||
return adjustedLanguage + remainder;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user