diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2014-04-28 08:43:33 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-04-28 08:43:33 +0000 |
| commit | 9b847b50b0776551913643581d435087bbce88fe (patch) | |
| tree | 1d56449a45dd4852601c04eb5d7470fc2d2bdf22 | |
| parent | 1289c571a2559ba4116bda4882c928287736e959 (diff) | |
| parent | 0a77444375579152ff8d117fbf0ce6aede51b834 (diff) | |
| download | latinime-9b847b50b0776551913643581d435087bbce88fe.tar.gz latinime-9b847b50b0776551913643581d435087bbce88fe.tar.xz latinime-9b847b50b0776551913643581d435087bbce88fe.zip | |
am 0a774443: Merge "Small clean up on MAX_LOCALE_STRING_LENGTH"
* commit '0a77444375579152ff8d117fbf0ce6aede51b834':
Small clean up on MAX_LOCALE_STRING_LENGTH
| -rw-r--r-- | native/jni/src/defines.h | 3 | ||||
| -rw-r--r-- | native/jni/src/suggest/core/layout/proximity_info.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/native/jni/src/defines.h b/native/jni/src/defines.h index 3becc79e8..2fe2bd8fa 100644 --- a/native/jni/src/defines.h +++ b/native/jni/src/defines.h @@ -330,9 +330,6 @@ static inline void prof_out(void) { #define MAX_PROBABILITY 255 #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 // TODO: Remove #define MAX_VALUE_FOR_WEIGHTING 10000000 diff --git a/native/jni/src/suggest/core/layout/proximity_info.h b/native/jni/src/suggest/core/layout/proximity_info.h index 56711d1ff..d4e453736 100644 --- a/native/jni/src/suggest/core/layout/proximity_info.h +++ b/native/jni/src/suggest/core/layout/proximity_info.h @@ -103,6 +103,8 @@ class ProximityInfo { const int KEYBOARD_HEIGHT; const float KEYBOARD_HYPOTENUSE; 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]; int *mProximityCharsArray; int mKeyXCoordinates[MAX_KEY_COUNT_IN_A_KEYBOARD]; |