aboutsummaryrefslogtreecommitdiffstats
path: root/native/src/proximity_info.cpp
diff options
context:
space:
mode:
authorYusuke Nojima <nojima@google.com>2011-09-27 20:27:17 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-09-27 20:27:17 -0700
commita59f65ad0cadfd2e71ebbe7ca8b14285a4db6ae2 (patch)
tree7c7691f4f64c2a79d6aebf0d3002a61a6f74121c /native/src/proximity_info.cpp
parent63584323cab56c76debf6bb000621f2c605329a9 (diff)
parent1c923d8581fb2af76add7f00802cea4d26ac4e84 (diff)
downloadlatinime-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/proximity_info.cpp')
-rw-r--r--native/src/proximity_info.cpp4
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) {