diff options
| author |   Yusuke Nojima <nojima@google.com> | 2011-09-27 20:36:29 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2011-09-27 20:36:29 -0700 |
| commit | 386489983d2e263c067e81c7dd6a8d92bce589fa (patch) | |
| tree | 7c7691f4f64c2a79d6aebf0d3002a61a6f74121c /native/src/proximity_info.cpp | |
| parent | cc4d71a062d7c7e8e3ee4d3414d9b8e3cbad2e37 (diff) | |
| parent | a59f65ad0cadfd2e71ebbe7ca8b14285a4db6ae2 (diff) | |
| download | latinime-386489983d2e263c067e81c7dd6a8d92bce589fa.tar.gz latinime-386489983d2e263c067e81c7dd6a8d92bce589fa.tar.xz latinime-386489983d2e263c067e81c7dd6a8d92bce589fa.zip | |
am a59f65ad: Merge "Extend JNI interface to pass the theme id of the keybaord to the native."
* commit 'a59f65ad0cadfd2e71ebbe7ca8b14285a4db6ae2':
Extend JNI interface to pass the theme id of the keybaord to the native.
Diffstat (limited to 'native/src/proximity_info.cpp')
| -rw-r--r-- | native/src/proximity_info.cpp | 4 |
1 files changed, 2 insertions, 2 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) { |