Merge "Fix a bug with negative coordinates, step 1"

main
Jean Chalard 2012-03-23 03:48:53 -07:00 committed by Android (Google) Code Review
commit 7f18f44461
1 changed files with 39 additions and 37 deletions

View File

@ -156,6 +156,7 @@ void ProximityInfo::calculateNearbyKeyCodes(
int insertPos = 0;
inputCodes[insertPos++] = primaryKey;
const int startIndex = getStartIndexFromCoordinates(x, y);
for (int i = 0; i < MAX_PROXIMITY_CHARS_SIZE; ++i) {
const int32_t c = mProximityCharsArray[startIndex + i];
if (c < KEYCODE_SPACE || c == primaryKey) {
@ -207,6 +208,7 @@ void ProximityInfo::calculateNearbyKeyCodes(
}
}
}
// Add a delimiter for the proximity characters
for (int i = insertPos; i < MAX_PROXIMITY_CHARS_SIZE; ++i) {
inputCodes[i] = NOT_A_CODE;