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

Export matchesLanguageAndScript() API in LocaleList

Browse Source 
Bug: 209729853
Test: atest LocaleListTest
Change-Id: I173fa6b525d3d265663e121c781b999ea573ea95
This commit is contained in:
allenwtsu
2021-12-20 11:43:41 +08:00
parent 774ef9f71b
commit 51dcd501ee
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/current.txt
View File

@@ -31867,6 +31867,7 @@ package android.os {
method @IntRange(from=0xffffffff) public int indexOf(java.util.Locale);
method public boolean isEmpty();
method public static boolean isPseudoLocale(@Nullable android.icu.util.ULocale);
method public static boolean matchesLanguageAndScript(@NonNull java.util.Locale, @NonNull java.util.Locale);
method public static void setDefault(@NonNull @Size(min=1) android.os.LocaleList);
method @IntRange(from=0) public int size();
method @NonNull public String toLanguageTags();

32
core/java/android/os/LocaleList.java
View File

@@ -20,6 +20,7 @@ import android.annotation.IntRange;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.Size;
import android.annotation.SuppressLint;
import android.compat.annotation.UnsupportedAppUsage;
import android.icu.util.ULocale;
@@ -312,18 +313,30 @@ public final class LocaleList implements Parcelable {
return isPseudoLocale(locale != null ? locale.toLocale() : null);
}
@IntRange(from=0, to=1)
private static int matchScore(Locale supported, Locale desired) {
/**
* Determine whether two locales are considered a match, even if they are not exactly equal.
* They are considered as a match when both of their languages and scripts
* (explicit or inferred) are identical. This means that a user would be able to understand
* the content written in the supported locale even if they say they prefer the desired locale.
*
* E.g. [zh-HK] matches [zh-Hant]; [en-US] matches [en-CA]
*
* @param supported The supported {@link Locale} to be compared.
* @param desired The desired {@link Locale} to be compared.
* @return True if they match, false otherwise.
*/
public static boolean matchesLanguageAndScript(@SuppressLint("UseIcu") @NonNull
Locale supported, @SuppressLint("UseIcu") @NonNull Locale desired) {
if (supported.equals(desired)) {
return 1; // return early so we don't do unnecessary computation
return true; // return early so we don't do unnecessary computation
}
if (!supported.getLanguage().equals(desired.getLanguage())) {
return 0;
return false;
}
if (isPseudoLocale(supported) || isPseudoLocale(desired)) {
// The locales are not the same, but the languages are the same, and one of the locales
// is a pseudo-locale. So this is not a match.
return 0;
return false;
}
final String supportedScr = getLikelyScript(supported);
if (supportedScr.isEmpty()) {
@@ -331,20 +344,17 @@ public final class LocaleList implements Parcelable {
// if the locales match. So we fall back to old behavior of matching, which considered
// locales with different regions different.
final String supportedRegion = supported.getCountry();
return (supportedRegion.isEmpty() ||
supportedRegion.equals(desired.getCountry()))
? 1 : 0;
return supportedRegion.isEmpty() || supportedRegion.equals(desired.getCountry());
}
final String desiredScr = getLikelyScript(desired);
// There is no match if the two locales use different scripts. This will most imporantly
// take care of traditional vs simplified Chinese.
return supportedScr.equals(desiredScr) ? 1 : 0;
return supportedScr.equals(desiredScr);
}
private int findFirstMatchIndex(Locale supportedLocale) {
for (int idx = 0; idx < mList.length; idx++) {
final int score = matchScore(supportedLocale, mList[idx]);
if (score > 0) {
if (matchesLanguageAndScript(supportedLocale, mList[idx])) {
return idx;
}
}