commit 1c923d8581fb2af76add7f00802cea4d26ac4e84
author Yusuke Nojima <nojima@google.com> Wed Sep 28 11:38:34 2011 +0900
committer Yusuke Nojima <nojima@google.com> Wed Sep 28 11:56:28 2011 +0900
tree f7a277c60fb487b62e129684b0c358e1fe14bd9a
parent e4ff4d6b1c14bb7ce20f8b93a90f9f80a3ea5fc3

Extend JNI interface to pass the theme id of the keybaord to the native.

Change-Id: I705ec2fa1d32a673a8d84bc9afc2a46208a414a1

native/src/proximity_info.cpp

diff --git a/native/src/proximity_info.cpp b/native/src/proximity_info.cpp
index 87cacd9..58842b9 100644
--- a/native/src/proximity_info.cpp
+++ b/native/src/proximity_info.cpp
@@ -38,12 +38,12 @@
         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) {

native/src/proximity_info.h

diff --git a/native/src/proximity_info.h b/native/src/proximity_info.h
index 834997f..3190e73 100644
--- a/native/src/proximity_info.h
+++ b/native/src/proximity_info.h
@@ -37,7 +37,7 @@
             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 @@
     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];