Merge "Refactor to suppress null worning"

main
satok 2012-03-05 04:08:23 -08:00 committed by Android (Google) Code Review
commit 433be45fce
1 changed files with 26 additions and 27 deletions

View File

@ -119,11 +119,6 @@ public class ProximityInfo {
sweetSpotCenterYs = new float[keyCount];
sweetSpotRadii = new float[keyCount];
calculateSweetSpotParams = true;
} else {
sweetSpotCenterXs = sweetSpotCenterYs = sweetSpotRadii = null;
calculateSweetSpotParams = false;
}
int i = 0;
for (final Key key : keys) {
keyXCoordinates[i] = key.mX;
@ -150,6 +145,10 @@ public class ProximityInfo {
}
i++;
}
} else {
sweetSpotCenterXs = sweetSpotCenterYs = sweetSpotRadii = null;
calculateSweetSpotParams = false;
}
mNativeProximityInfo = setProximityInfoNative(MAX_PROXIMITY_CHARS_SIZE,
keyboardWidth, keyboardHeight, mGridWidth, mGridHeight, proximityCharsArray,