am 0a774443: Merge "Small clean up on MAX_LOCALE_STRING_LENGTH"

* commit '0a77444375579152ff8d117fbf0ce6aede51b834':
  Small clean up on MAX_LOCALE_STRING_LENGTH
main
Ken Wakasa 2014-04-28 08:43:33 +00:00 committed by Android Git Automerger
commit 9b847b50b0
2 changed files with 2 additions and 3 deletions

View File

@ -330,9 +330,6 @@ static inline void prof_out(void) {
#define MAX_PROBABILITY 255 #define MAX_PROBABILITY 255
#define MAX_BIGRAM_ENCODED_PROBABILITY 15 #define MAX_BIGRAM_ENCODED_PROBABILITY 15
// Assuming locale strings such as en_US, sr-Latn etc.
#define MAX_LOCALE_STRING_LENGTH 10
// Max value for length, distance and probability which are used in weighting // Max value for length, distance and probability which are used in weighting
// TODO: Remove // TODO: Remove
#define MAX_VALUE_FOR_WEIGHTING 10000000 #define MAX_VALUE_FOR_WEIGHTING 10000000

View File

@ -103,6 +103,8 @@ class ProximityInfo {
const int KEYBOARD_HEIGHT; const int KEYBOARD_HEIGHT;
const float KEYBOARD_HYPOTENUSE; const float KEYBOARD_HYPOTENUSE;
const bool HAS_TOUCH_POSITION_CORRECTION_DATA; const bool HAS_TOUCH_POSITION_CORRECTION_DATA;
// Assuming locale strings such as en_US, sr-Latn etc.
static const int MAX_LOCALE_STRING_LENGTH = 10;
char mLocaleStr[MAX_LOCALE_STRING_LENGTH]; char mLocaleStr[MAX_LOCALE_STRING_LENGTH];
int *mProximityCharsArray; int *mProximityCharsArray;
int mKeyXCoordinates[MAX_KEY_COUNT_IN_A_KEYBOARD]; int mKeyXCoordinates[MAX_KEY_COUNT_IN_A_KEYBOARD];