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

Commit af01a65f authored by Tom Ouyang's avatar Tom Ouyang Committed by Android (Google) Code Review
Browse files

Merge "Add keyboard hypotenuse metric to ProximityInfo."

parents 927c2d65 625778fd

native/jni/src/proximity_info.cpp

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */



#include <cstring>

#include <cmath>



#define LOG_TAG "LatinIME: proximity_info.cpp"
@@ -59,6 +60,7 @@ ProximityInfo::ProximityInfo(JNIEnv *env, const jstring localeJStr, 
          CELL_HEIGHT((keyboardHeight + gridHeight - 1) / gridHeight),

          KEY_COUNT(min(keyCount, MAX_KEY_COUNT_IN_A_KEYBOARD)),

          KEYBOARD_WIDTH(keyboardWidth), KEYBOARD_HEIGHT(keyboardHeight),

          KEYBOARD_HYPOTENUSE(hypotf(KEYBOARD_WIDTH, KEYBOARD_HEIGHT)),

          HAS_TOUCH_POSITION_CORRECTION_DATA(keyCount > 0 && keyXCoordinates && keyYCoordinates

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

                  && sweetSpotCenterYs && sweetSpotRadii),

native/jni/src/proximity_info.h

+2 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ class ProximityInfo { 
    int getGridHeight() const { return GRID_HEIGHT; }

    int getKeyboardWidth() const { return KEYBOARD_WIDTH; }

    int getKeyboardHeight() const { return KEYBOARD_HEIGHT; }

    float getKeyboardHypotenuse() const { return KEYBOARD_HYPOTENUSE; }



    int getKeyCenterXOfCodePointG(int charCode) const;

    int getKeyCenterYOfCodePointG(int charCode) const;
@@ -97,6 +98,7 @@ class ProximityInfo { 
    const int KEY_COUNT;

    const int KEYBOARD_WIDTH;

    const int KEYBOARD_HEIGHT;

    const float KEYBOARD_HYPOTENUSE;

    const bool HAS_TOUCH_POSITION_CORRECTION_DATA;

    char mLocaleStr[MAX_LOCALE_STRING_LENGTH];

    int *mProximityCharsArray;