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

Merge "Rename registerLanguageList to registerLocaleList."

Browse Source
This commit is contained in:
TreeHugger Robot
2017-10-23 18:37:49 +00:00
committed by Android (Google) Code Review
parent 810a6c53b3 92374482d2
commit bb96e19b53
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/jni/android/graphics/FontFamily.cpp
View File

@@ -56,9 +56,9 @@ static jlong FontFamily_initBuilder(JNIEnv* env, jobject clazz, jstring langs, j
if (langs != nullptr) {
ScopedUtfChars str(env, langs);
builder = new NativeFamilyBuilder(
minikin::FontStyle::registerLanguageList(str.c_str()), variant);
minikin::FontStyle::registerLocaleList(str.c_str()), variant);
} else {
builder = new NativeFamilyBuilder(minikin::FontStyle::registerLanguageList(""), variant);
builder = new NativeFamilyBuilder(minikin::FontStyle::registerLocaleList(""), variant);
}
return reinterpret_cast<jlong>(builder);
}

2
core/jni/android/graphics/Paint.cpp
View File

@@ -544,7 +544,7 @@ namespace PaintGlue {
static jint setTextLocales(JNIEnv* env, jobject clazz, jlong objHandle, jstring locales) {
Paint* obj = reinterpret_cast<Paint*>(objHandle);
ScopedUtfChars localesChars(env, locales);
jint minikinLangListId = minikin::FontStyle::registerLanguageList(localesChars.c_str());
jint minikinLangListId = minikin::FontStyle::registerLocaleList(localesChars.c_str());
obj->setMinikinLangListId(minikinLangListId);
return minikinLangListId;
}