diff options
| author |   Yusuke Nojima <nojima@google.com> | 2011-09-27 20:27:17 -0700 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2011-09-27 20:27:17 -0700 |
| commit | a59f65ad0cadfd2e71ebbe7ca8b14285a4db6ae2 (patch) | |
| tree | 7c7691f4f64c2a79d6aebf0d3002a61a6f74121c /native/src | |
| parent | 63584323cab56c76debf6bb000621f2c605329a9 (diff) | |
| parent | 1c923d8581fb2af76add7f00802cea4d26ac4e84 (diff) | |
| download | latinime-a59f65ad0cadfd2e71ebbe7ca8b14285a4db6ae2.tar.gz latinime-a59f65ad0cadfd2e71ebbe7ca8b14285a4db6ae2.tar.xz latinime-a59f65ad0cadfd2e71ebbe7ca8b14285a4db6ae2.zip | |
Merge "Extend JNI interface to pass the theme id of the keybaord to the native."
Diffstat (limited to 'native/src')
| -rw-r--r-- | native/src/proximity_info.cpp | 4 | ||||
| -rw-r--r-- | native/src/proximity_info.h | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/native/src/proximity_info.cpp b/native/src/proximity_info.cpp index 87cacd938..58842b92f 100644 --- a/native/src/proximity_info.cpp +++ b/native/src/proximity_info.cpp @@ -38,12 +38,12 @@ ProximityInfo::ProximityInfo(const int maxProximityCharsSize, const int keyboard const int keyboardHeight, const int gridWidth, const int gridHeight, const uint32_t *proximityCharsArray, const int keyCount, const int32_t *keyXCoordinates, const int32_t *keyYCoordinates, const int32_t *keyWidths, const int32_t *keyHeights, - const int32_t *keyCharCodes) + const int32_t *keyCharCodes, int themeId) : MAX_PROXIMITY_CHARS_SIZE(maxProximityCharsSize), KEYBOARD_WIDTH(keyboardWidth), KEYBOARD_HEIGHT(keyboardHeight), GRID_WIDTH(gridWidth), GRID_HEIGHT(gridHeight), CELL_WIDTH((keyboardWidth + gridWidth - 1) / gridWidth), CELL_HEIGHT((keyboardHeight + gridHeight - 1) / gridHeight), - KEY_COUNT(min(keyCount, MAX_KEY_COUNT_IN_A_KEYBOARD)) { + KEY_COUNT(min(keyCount, MAX_KEY_COUNT_IN_A_KEYBOARD)), THEME_ID(themeId) { const int len = GRID_WIDTH * GRID_HEIGHT * MAX_PROXIMITY_CHARS_SIZE; mProximityCharsArray = new uint32_t[len]; if (DEBUG_PROXIMITY_INFO) { diff --git a/native/src/proximity_info.h b/native/src/proximity_info.h index 834997fb9..3190e73ef 100644 --- a/native/src/proximity_info.h +++ b/native/src/proximity_info.h @@ -37,7 +37,7 @@ public: const int keybaordHeight, const int gridWidth, const int gridHeight, const uint32_t *proximityCharsArray, const int keyCount, const int32_t *keyXCoordinates, const int32_t *keyYCoordinates, const int32_t *keyWidths, const int32_t *keyHeights, - const int32_t *keyCharCodes); + const int32_t *keyCharCodes, int themeId); ~ProximityInfo(); bool hasSpaceProximity(const int x, const int y) const; void setInputParams(const int* inputCodes, const int inputLength); @@ -69,6 +69,7 @@ private: const int CELL_WIDTH; const int CELL_HEIGHT; const int KEY_COUNT; + const int THEME_ID; const int *mInputCodes; uint32_t *mProximityCharsArray; int32_t mKeyXCoordinates[MAX_KEY_COUNT_IN_A_KEYBOARD]; |