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

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

Merge "Variable type cleanups" into jb-mr1-dev

parents 9a7e02d6 5964d4e6

native/jni/src/proximity_info.cpp

+4 −4
Original line number Diff line number Diff line
@@ -275,22 +275,22 @@ void ProximityInfo::initializeG() { 
    }

}



float ProximityInfo::getKeyCenterXOfCodePointG(int charCode) const {

int ProximityInfo::getKeyCenterXOfCodePointG(int charCode) const {

    return getKeyCenterXOfKeyIdG(getKeyIndexOf(charCode));

}



float ProximityInfo::getKeyCenterYOfCodePointG(int charCode) const {

int ProximityInfo::getKeyCenterYOfCodePointG(int charCode) const {

    return getKeyCenterYOfKeyIdG(getKeyIndexOf(charCode));

}



float ProximityInfo::getKeyCenterXOfKeyIdG(int keyId) const {

int ProximityInfo::getKeyCenterXOfKeyIdG(int keyId) const {

    if (keyId >= 0) {

        return mCenterXsG[keyId];

    }

    return 0;

}



float ProximityInfo::getKeyCenterYOfKeyIdG(int keyId) const {

int ProximityInfo::getKeyCenterYOfKeyIdG(int keyId) const {

    if (keyId >= 0) {

        return mCenterYsG[keyId];

    }

native/jni/src/proximity_info.h

+4 −5
Original line number Diff line number Diff line
@@ -104,11 +104,10 @@ class ProximityInfo { 
        return KEYBOARD_HEIGHT;

    }



    // TODO: These should return int.

    float getKeyCenterXOfCodePointG(int charCode) const;

    float getKeyCenterYOfCodePointG(int charCode) const;

    float getKeyCenterXOfKeyIdG(int keyId) const;

    float getKeyCenterYOfKeyIdG(int keyId) const;

    int getKeyCenterXOfCodePointG(int charCode) const;

    int getKeyCenterYOfCodePointG(int charCode) const;

    int getKeyCenterXOfKeyIdG(int keyId) const;

    int getKeyCenterYOfKeyIdG(int keyId) const;

    int getKeyKeyDistanceG(int key0, int key1) const;



 private: