diff options
| -rw-r--r-- | java/res/values/strings.xml | 4 | ||||
| -rw-r--r-- | native/jni/Android.mk | 2 | ||||
| -rw-r--r-- | native/jni/src/correction.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index ebcd3d956..fb341acc3 100644 --- a/java/res/values/strings.xml +++ b/java/res/values/strings.xml @@ -498,9 +498,9 @@ <!-- Message about some dictionary indicating the file is installed, but the dictionary is disabled --> <string name="dictionary_disabled">Installed, disabled</string> - <!-- Message to display in the dictionaries setting screen when some error prevented us to list installed dictionaries [CHAR LIMIT=20] --> + <!-- Message to display in the dictionaries setting screen when some error prevented us to list installed dictionaries [CHAR LIMIT=50] --> <string name="cannot_connect_to_dict_service">Problem connecting to dictionary service</string> - <!-- Message to display in the dictionaries setting screen when we found that no dictionaries are available [CHAR LIMIT=20]--> + <!-- Message to display in the dictionaries setting screen when we found that no dictionaries are available [CHAR LIMIT=50]--> <string name="no_dictionaries_available">No dictionaries available</string> <!-- Title of the options to press to refresh the list (as in, check for updates now) [CHAR_LIMIT=50] --> diff --git a/native/jni/Android.mk b/native/jni/Android.mk index b476fc3d1..4df25856d 100644 --- a/native/jni/Android.mk +++ b/native/jni/Android.mk @@ -37,7 +37,7 @@ LOCAL_CFLAGS += -Werror -Wall -Wextra -Weffc++ -Wformat=2 -Wcast-qual -Wcast-ali -Wwrite-strings -Wfloat-equal -Wpointer-arith -Winit-self -Wredundant-decls -Wno-system-headers ifeq ($(TARGET_ARCH), arm) -ifneq ($(TARGET_GCC_VERSION), 4.7) +ifeq ($(TARGET_GCC_VERSION), 4.6) LOCAL_CFLAGS += -Winline endif # TARGET_GCC_VERSION endif # TARGET_ARCH diff --git a/native/jni/src/correction.h b/native/jni/src/correction.h index f0d62102f..a9e9b48a6 100644 --- a/native/jni/src/correction.h +++ b/native/jni/src/correction.h @@ -307,7 +307,7 @@ inline void Correction::startToTraverseAllNodes() { mNeedsToTraverseAllNodes = true; } -inline bool Correction::isSingleQuote(const int c) { +AK_FORCE_INLINE bool Correction::isSingleQuote(const int c) { const int userTypedChar = mProximityInfoState.getPrimaryCodePointAt(mInputIndex); return (c == KEYCODE_SINGLE_QUOTE && userTypedChar != KEYCODE_SINGLE_QUOTE); } |