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

Commit 71b379df authored by Ken Wakasa's avatar Ken Wakasa Committed by Android (Google) Code Review
Browse files

Merge "Use GetStringUTFRegion" into jb-mr1-dev

parents 9d298716 01511459

native/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp

+1 −4
Original line number Diff line number Diff line
@@ -29,18 +29,15 @@ static jlong latinime_Keyboard_setProximityInfo(JNIEnv *env, jobject object, 
        jint keyCount, jintArray keyXCoordinates, jintArray keyYCoordinates,

        jintArray keyWidths, jintArray keyHeights, jintArray keyCharCodes,

        jfloatArray sweetSpotCenterXs, jfloatArray sweetSpotCenterYs, jfloatArray sweetSpotRadii) {

    const char *localeCStr = env->GetStringUTFChars(localeJStr, 0);

    ProximityInfo *proximityInfo = new ProximityInfo(env, localeCStr, maxProximityCharsSize,

    ProximityInfo *proximityInfo = new ProximityInfo(env, localeJStr, maxProximityCharsSize,

            displayWidth, displayHeight, gridWidth, gridHeight, mostCommonkeyWidth, proximityChars,

            keyCount, keyXCoordinates, keyYCoordinates, keyWidths, keyHeights, keyCharCodes,

            sweetSpotCenterXs, sweetSpotCenterYs, sweetSpotRadii);

    env->ReleaseStringUTFChars(localeJStr, localeCStr);

    return reinterpret_cast<jlong>(proximityInfo);

}



static void latinime_Keyboard_release(JNIEnv *env, jobject object, jlong proximityInfo) {

    ProximityInfo *pi = reinterpret_cast<ProximityInfo*>(proximityInfo);

    if (!pi) return;

    delete pi;

}

native/jni/src/proximity_info.cpp

+10 −5
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ static inline void safeGetOrFillZeroFloatArrayRegion(JNIEnv *env, jfloatArray jA 
    }

}



ProximityInfo::ProximityInfo(JNIEnv *env, const char *localeCStr, const int maxProximityCharsSize,

ProximityInfo::ProximityInfo(JNIEnv *env, const jstring localeJStr, const int maxProximityCharsSize,

        const int keyboardWidth, const int keyboardHeight, const int gridWidth,

        const int gridHeight, const int mostCommonKeyWidth, const jintArray proximityChars,

        const int keyCount, const jintArray keyXCoordinates, const jintArray keyYCoordinates,
@@ -62,12 +62,16 @@ ProximityInfo::ProximityInfo(JNIEnv *env, const char *localeCStr, const int maxP 
          KEY_COUNT(min(keyCount, MAX_KEY_COUNT_IN_A_KEYBOARD)),

          HAS_TOUCH_POSITION_CORRECTION_DATA(keyCount > 0 && keyXCoordinates && keyYCoordinates

                  && keyWidths && keyHeights && keyCharCodes && sweetSpotCenterXs

                  && sweetSpotCenterYs && sweetSpotRadii),

          mLocaleStr(localeCStr) {

                  && sweetSpotCenterYs && sweetSpotRadii) {

    const int proximityGridLength = GRID_WIDTH * GRID_HEIGHT * MAX_PROXIMITY_CHARS_SIZE;

    if (DEBUG_PROXIMITY_INFO) {

        AKLOGI("Create proximity info array %d", proximityGridLength);

    }

    const jsize localeCStrUtf8Length = env->GetStringUTFLength(localeJStr);

    char localeCStr[localeCStrUtf8Length + 1];

    env->GetStringUTFRegion(localeJStr, 0, env->GetStringLength(localeJStr), localeCStr);

    localeCStr[localeCStrUtf8Length] = '\0';

    mLocaleStr = new std::string(localeCStr);

    mProximityCharsArray = new int32_t[proximityGridLength];

    safeGetOrFillZeroIntArrayRegion(env, proximityChars, proximityGridLength, mProximityCharsArray);

    safeGetOrFillZeroIntArrayRegion(env, keyXCoordinates, KEY_COUNT, mKeyXCoordinates);
@@ -94,6 +98,7 @@ void ProximityInfo::initializeCodeToKeyIndex() { 
}



ProximityInfo::~ProximityInfo() {

    delete mLocaleStr;

    delete[] mProximityCharsArray;

}
@@ -166,7 +171,7 @@ void ProximityInfo::calculateNearbyKeyCodes( 
            }

        }

        const int additionalProximitySize =

                AdditionalProximityChars::getAdditionalCharsSize(&mLocaleStr, primaryKey);

                AdditionalProximityChars::getAdditionalCharsSize(mLocaleStr, primaryKey);

        if (additionalProximitySize > 0) {

            inputCodes[insertPos++] = ADDITIONAL_PROXIMITY_CHAR_DELIMITER_CODE;

            if (insertPos >= MAX_PROXIMITY_CHARS_SIZE) {
@@ -177,7 +182,7 @@ void ProximityInfo::calculateNearbyKeyCodes( 
            }



            const int32_t *additionalProximityChars =

                    AdditionalProximityChars::getAdditionalChars(&mLocaleStr, primaryKey);

                    AdditionalProximityChars::getAdditionalChars(mLocaleStr, primaryKey);

            for (int j = 0; j < additionalProximitySize; ++j) {

                const int32_t ac = additionalProximityChars[j];

                int k = 0;

native/jni/src/proximity_info.h

+3 −3
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ class Correction; 


class ProximityInfo {

 public:

    ProximityInfo(JNIEnv *env, const char *localeCStr, const int maxProximityCharsSize,

    ProximityInfo(JNIEnv *env, const jstring localeJStr, const int maxProximityCharsSize,

            const int keyboardWidth, const int keyboardHeight, const int gridWidth,

            const int gridHeight, const int mostCommonKeyWidth, const jintArray proximityChars,

            const int keyCount, const jintArray keyXCoordinates, const jintArray keyYCoordinates,
@@ -76,7 +76,7 @@ class ProximityInfo { 
    }



    std::string getLocaleStr() const {

        return mLocaleStr;

        return *mLocaleStr;

    }



    int getKeyCount() const {
@@ -129,7 +129,7 @@ class ProximityInfo { 
    const int CELL_HEIGHT;

    const int KEY_COUNT;

    const bool HAS_TOUCH_POSITION_CORRECTION_DATA;

    const std::string mLocaleStr;

    const std::string *mLocaleStr;

    int32_t *mProximityCharsArray;

    int32_t mKeyXCoordinates[MAX_KEY_COUNT_IN_A_KEYBOARD];

    int32_t mKeyYCoordinates[MAX_KEY_COUNT_IN_A_KEYBOARD];