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

Commit 76e431b3 authored by Keisuke Kuroyanagi's avatar Keisuke Kuroyanagi Committed by Android (Google) Code Review
Browse files

Merge "Use same session id for typing and gesture."

parents fc5e78b6 f1233b58

java/src/com/android/inputmethod/latin/Suggest.java

+2 −1
Original line number Diff line number Diff line
@@ -48,8 +48,9 @@ public final class Suggest { 


    // Session id for

    // {@link #getSuggestedWords(WordComposer,String,ProximityInfo,boolean,int)}.

    // We are sharing the same ID between typing and gesture to save RAM footprint.

    public static final int SESSION_TYPING = 0;

    public static final int SESSION_GESTURE = 1;

    public static final int SESSION_GESTURE = 0;



    // TODO: rename this to CORRECTION_OFF

    public static final int CORRECTION_NONE = 0;

native/jni/src/suggest/core/layout/proximity_info_state.cpp

+3 −2
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ void ProximityInfoState::initInputParams(const int pointerId, const float maxPoi 
        const int *const xCoordinates, const int *const yCoordinates, const int *const times,

        const int *const pointerIds, const bool isGeometric) {

    ASSERT(isGeometric || (inputSize < MAX_WORD_LENGTH));

    mIsContinuousSuggestionPossible =

            ProximityInfoStateUtils::checkAndReturnIsContinuousSuggestionPossible(

    mIsContinuousSuggestionPossible = (mHasBeenUpdatedByGeometricInput != isGeometric) ?

            false : ProximityInfoStateUtils::checkAndReturnIsContinuousSuggestionPossible(

                    inputSize, xCoordinates, yCoordinates, times, mSampledInputSize,

                    &mSampledInputXs, &mSampledInputYs, &mSampledTimes, &mSampledInputIndice);

    if (DEBUG_DICT) {
@@ -155,6 +155,7 @@ void ProximityInfoState::initInputParams(const int pointerId, const float maxPoi 
    if (DEBUG_GEO_FULL) {

        AKLOGI("ProximityState init finished: %d points out of %d", mSampledInputSize, inputSize);

    }

    mHasBeenUpdatedByGeometricInput = isGeometric;

}



// This function basically converts from a length to an edit distance. Accordingly, it's obviously

native/jni/src/suggest/core/layout/proximity_info_state.h

+6 −4
Original line number Diff line number Diff line
@@ -46,10 +46,11 @@ class ProximityInfoState { 
            : mProximityInfo(0), mMaxPointToKeyLength(0.0f), mAverageSpeed(0.0f),

              mHasTouchPositionCorrectionData(false), mMostCommonKeyWidthSquare(0),

              mKeyCount(0), mCellHeight(0), mCellWidth(0), mGridHeight(0), mGridWidth(0),

              mIsContinuousSuggestionPossible(false), mSampledInputXs(), mSampledInputYs(),

              mSampledTimes(), mSampledInputIndice(), mSampledLengthCache(),

              mBeelineSpeedPercentiles(), mSampledNormalizedSquaredLengthCache(), mSpeedRates(),

              mDirections(), mCharProbabilities(), mSampledNearKeySets(), mSampledSearchKeySets(),

              mIsContinuousSuggestionPossible(false), mHasBeenUpdatedByGeometricInput(false),

              mSampledInputXs(), mSampledInputYs(), mSampledTimes(), mSampledInputIndice(),

              mSampledLengthCache(), mBeelineSpeedPercentiles(),

              mSampledNormalizedSquaredLengthCache(), mSpeedRates(), mDirections(),

              mCharProbabilities(), mSampledNearKeySets(), mSampledSearchKeySets(),

              mSampledSearchKeyVectors(), mTouchPositionCorrectionEnabled(false),

              mSampledInputSize(0), mMostProbableStringProbability(0.0f) {

        memset(mInputProximities, 0, sizeof(mInputProximities));
@@ -204,6 +205,7 @@ class ProximityInfoState { 
    int mGridHeight;

    int mGridWidth;

    bool mIsContinuousSuggestionPossible;

    bool mHasBeenUpdatedByGeometricInput;



    std::vector<int> mSampledInputXs;

    std::vector<int> mSampledInputYs;