diff options
| -rw-r--r-- | native/jni/src/proximity_info.cpp | 6 | ||||
| -rw-r--r-- | native/jni/src/proximity_info.h | 6 | ||||
| -rw-r--r-- | tools/maketext/Android.mk | 1 | ||||
| -rw-r--r-- | tools/maketext/etc/Android.mk | 3 |
4 files changed, 6 insertions, 10 deletions
diff --git a/native/jni/src/proximity_info.cpp b/native/jni/src/proximity_info.cpp index 960d40119..80e14fbb1 100644 --- a/native/jni/src/proximity_info.cpp +++ b/native/jni/src/proximity_info.cpp @@ -35,6 +35,8 @@ inline void copyOrFillZero(void *to, const void *from, size_t size) { } } +const float ProximityInfo::NOT_A_DISTANCE_FLOAT = -1.0f; + ProximityInfo::ProximityInfo(const std::string localeStr, const int maxProximityCharsSize, const int keyboardWidth, const int keyboardHeight, const int gridWidth, const int gridHeight, const int mostCommonKeyWidth, @@ -42,8 +44,8 @@ ProximityInfo::ProximityInfo(const std::string localeStr, const int maxProximity const int32_t *keyYCoordinates, const int32_t *keyWidths, const int32_t *keyHeights, const int32_t *keyCharCodes, const float *sweetSpotCenterXs, const float *sweetSpotCenterYs, const float *sweetSpotRadii) - : MAX_PROXIMITY_CHARS_SIZE(maxProximityCharsSize), KEYBOARD_WIDTH(keyboardWidth), - KEYBOARD_HEIGHT(keyboardHeight), GRID_WIDTH(gridWidth), GRID_HEIGHT(gridHeight), + : MAX_PROXIMITY_CHARS_SIZE(maxProximityCharsSize), + GRID_WIDTH(gridWidth), GRID_HEIGHT(gridHeight), MOST_COMMON_KEY_WIDTH_SQUARE(mostCommonKeyWidth * mostCommonKeyWidth), CELL_WIDTH((keyboardWidth + gridWidth - 1) / gridWidth), CELL_HEIGHT((keyboardHeight + gridHeight - 1) / gridHeight), diff --git a/native/jni/src/proximity_info.h b/native/jni/src/proximity_info.h index feb0c9444..3a2511cf1 100644 --- a/native/jni/src/proximity_info.h +++ b/native/jni/src/proximity_info.h @@ -77,7 +77,7 @@ class ProximityInfo { static const int MAX_KEY_COUNT_IN_A_KEYBOARD = 64; // The upper limit of the char code in mCodeToKeyIndex static const int MAX_CHAR_CODE = 127; - static const float NOT_A_DISTANCE_FLOAT = -1.0f; + static const float NOT_A_DISTANCE_FLOAT; static const int NOT_A_CODE = -1; int getStartIndexFromCoordinates(const int x, const int y) const; @@ -98,8 +98,6 @@ class ProximityInfo { const int x, const int y, const int32_t primaryKey, int *inputCodes) const; const int MAX_PROXIMITY_CHARS_SIZE; - const int KEYBOARD_WIDTH; - const int KEYBOARD_HEIGHT; const int GRID_WIDTH; const int GRID_HEIGHT; const int MOST_COMMON_KEY_WIDTH_SQUARE; @@ -108,8 +106,6 @@ class ProximityInfo { const int KEY_COUNT; const bool HAS_TOUCH_POSITION_CORRECTION_DATA; const std::string mLocaleStr; - // TODO: remove this - const int *mInputCodesFromJava; int32_t *mInputCodes; const int *mInputXCoordinates; const int *mInputYCoordinates; diff --git a/tools/maketext/Android.mk b/tools/maketext/Android.mk index 98731b718..77914cae6 100644 --- a/tools/maketext/Android.mk +++ b/tools/maketext/Android.mk @@ -19,7 +19,6 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES += $(call all-java-files-under,src) LOCAL_JAR_MANIFEST := etc/manifest.txt LOCAL_JAVA_RESOURCE_DIRS := res -LOCAL_MODULE_TAGS := eng LOCAL_MODULE := maketext include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/tools/maketext/etc/Android.mk b/tools/maketext/etc/Android.mk index 4fa194bcd..475676b3a 100644 --- a/tools/maketext/etc/Android.mk +++ b/tools/maketext/etc/Android.mk @@ -15,7 +15,6 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE_TAGS := eng - LOCAL_PREBUILT_EXECUTABLES := maketext + include $(BUILD_HOST_PREBUILT) |