From 9e15b4551eaff96c3cde6e99132a1aab3900f923 Mon Sep 17 00:00:00 2001
From: Ken Wakasa <kwakasa@google.com>
Date: Mon, 28 Apr 2014 16:50:06 +0900
Subject: [PATCH] Small clean up on MAX_LOCALE_STRING_LENGTH
Change-Id: I77f93879e841f33b81f6d193d1bd5782ad2124f5
---
native/jni/src/defines.h | 3 ---
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];