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

Merge "Allow soft hyphens in languages without patterns" into mnc-dev

Browse Source
This commit is contained in:
Raph Levien
2015-07-27 21:50:16 +00:00
committed by Android (Google) Code Review
parent 2e606d7be5 a00896198d
commit e827c2525a
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/java/android/text/Hyphenator.java
View File

@@ -45,6 +45,8 @@ public class Hyphenator {
@GuardedBy("sLock")
final static HashMap<Locale, Hyphenator> sMap = new HashMap<Locale, Hyphenator>();
final static Hyphenator sEmptyHyphenator = new Hyphenator(StaticLayout.nLoadHyphenator(""));
final private long mNativePtr;
private Hyphenator(long nativePtr) {
@@ -53,19 +55,19 @@ public class Hyphenator {
public static long get(@Nullable Locale locale) {
synchronized (sLock) {
if (sMap.containsKey(locale)) {
Hyphenator result = sMap.get(locale);
return (result == null) ? 0 : result.mNativePtr;
Hyphenator result = sMap.get(locale);
if (result != null) {
return result.mNativePtr;
}
// TODO: Convert this a proper locale-fallback system
// Fall back to language-only, if available
Locale languageOnlyLocale = new Locale(locale.getLanguage());
if (sMap.containsKey(languageOnlyLocale)) {
Hyphenator result = sMap.get(languageOnlyLocale);
result = sMap.get(languageOnlyLocale);
if (result != null) {
sMap.put(locale, result);
return (result == null) ? 0 : result.mNativePtr;
return result.mNativePtr;
}
// Fall back to script-only, if available
@@ -75,16 +77,16 @@ public class Hyphenator {
.setLanguage("und")
.setScript(script)
.build();
if (sMap.containsKey(scriptOnlyLocale)) {
Hyphenator result = sMap.get(scriptOnlyLocale);
result = sMap.get(scriptOnlyLocale);
if (result != null) {
sMap.put(locale, result);
return (result == null) ? 0 : result.mNativePtr;
return result.mNativePtr;
}
}
sMap.put(locale, null); // To remember we found nothing.
sMap.put(locale, sEmptyHyphenator); // To remember we found nothing.
}
return 0;
return sEmptyHyphenator.mNativePtr;
}
private static Hyphenator loadHyphenator(String languageTag) {