Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92374482 authored by Seigo Nonaka's avatar Seigo Nonaka
Browse files

Rename registerLanguageList to registerLocaleList. 

The minikin's public method FontStyle::registerLanguageList 
is now FontStyle::registerLocaleList.

Bug: 65024629
Test: make checkbuild
Change-Id: Ia42ea8c56972d2f1f9d4429af4b04e7a4eba1a60
parent 27df643c

core/jni/android/graphics/FontFamily.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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);

}

core/jni/android/graphics/Paint.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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;

    }