commit 0cb2097a45a41875ec2265da316eb770565b6706
author satok <satok@google.com> Tue Mar 13 22:07:56 2012 +0900
committer satok <satok@google.com> Wed Mar 14 11:17:59 2012 +0900
tree e7c9e54c1daa7a3cec07362c803300f4fb0fb53e
parent 7ef1dabd92a9dae042965cd10d08a2cd47455dcc

Fix additional proximity in the native code

Bug: 4343280
Change-Id: I4164bb916b2dbdfb6bdc151b99d46a6171d9c355

native/src/proximity_info.h

diff --git a/native/src/proximity_info.h b/native/src/proximity_info.h
index 8c342e0..1a47aff 100644
--- a/native/src/proximity_info.h
+++ b/native/src/proximity_info.h
@@ -47,7 +47,7 @@
     ProximityInfo(const std::string localeStr, const int maxProximityCharsSize,
             const int keyboardWidth, const int keybaordHeight, const int gridWidth,
             const int gridHeight, const int mostCommonkeyWidth,
-            const uint32_t *proximityCharsArray, const int keyCount, const int32_t *keyXCoordinates,
+            const int32_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 float *sweetSpotCenterXs,
             const float *sweetSpotCenterYs, const float *sweetSpotRadii);
@@ -92,7 +92,7 @@
     bool isOnKey(const int keyId, const int x, const int y);
     int squaredDistanceToEdge(const int keyId, const int x, const int y);
     void calculateNearbyKeyCodes(
-            const int x, const int y, const uint32_t primaryKey, int *inputCodes);
+            const int x, const int y, const int32_t primaryKey, int *inputCodes);
 
     const int MAX_PROXIMITY_CHARS_SIZE;
     const int KEYBOARD_WIDTH;
@@ -109,7 +109,7 @@
     const int *mInputXCoordinates;
     const int *mInputYCoordinates;
     bool mTouchPositionCorrectionEnabled;
-    uint32_t *mProximityCharsArray;
+    int32_t *mProximityCharsArray;
     int *mNormalizedSquaredDistances;
     int32_t mKeyXCoordinates[MAX_KEY_COUNT_IN_A_KEYBOARD];
     int32_t mKeyYCoordinates[MAX_KEY_COUNT_IN_A_KEYBOARD];