Merge "Move CandidateView into input view"
diff --git a/java/src/com/android/inputmethod/compat/CompatUtils.java b/java/src/com/android/inputmethod/compat/CompatUtils.java
index 0b532f7..10b2a10 100644
--- a/java/src/com/android/inputmethod/compat/CompatUtils.java
+++ b/java/src/com/android/inputmethod/compat/CompatUtils.java
@@ -108,7 +108,7 @@
public static Object invoke(
Object receiver, Object defaultValue, Method method, Object... args) {
- if (receiver == null || method == null) return defaultValue;
+ if (method == null) return defaultValue;
try {
return method.invoke(receiver, args);
} catch (IllegalArgumentException e) {
@@ -124,7 +124,7 @@
}
public static Object getFieldValue(Object receiver, Object defaultValue, Field field) {
- if (receiver == null || field == null) return defaultValue;
+ if (field == null) return defaultValue;
try {
return field.get(receiver);
} catch (IllegalArgumentException e) {
@@ -137,7 +137,7 @@
}
public static void setFieldValue(Object receiver, Field field, Object value) {
- if (receiver == null || field == null) return;
+ if (field == null) return;
try {
field.set(receiver, value);
} catch (IllegalArgumentException e) {
diff --git a/java/src/com/android/inputmethod/compat/EditorInfoCompatUtils.java b/java/src/com/android/inputmethod/compat/EditorInfoCompatUtils.java
index f6f4f7a..2789bcb 100644
--- a/java/src/com/android/inputmethod/compat/EditorInfoCompatUtils.java
+++ b/java/src/com/android/inputmethod/compat/EditorInfoCompatUtils.java
@@ -78,6 +78,9 @@
case EditorInfo.IME_ACTION_SEND:
action = "actionSend";
break;
+ case EditorInfo.IME_ACTION_NEXT:
+ action = "actionNext";
+ break;
case EditorInfo.IME_ACTION_DONE:
action = "actionDone";
break;
diff --git a/native/src/defines.h b/native/src/defines.h
index bdab19f..0a32405 100644
--- a/native/src/defines.h
+++ b/native/src/defines.h
@@ -140,7 +140,7 @@
// The following "rate"s are used as a multiplier before dividing by 100, so they are in percent.
#define WORDS_WITH_MISSING_CHARACTER_DEMOTION_RATE 80
#define WORDS_WITH_MISSING_CHARACTER_DEMOTION_START_POS_10X 12
-#define WORDS_WITH_MISSING_SPACE_CHARACTER_DEMOTION_RATE 80
+#define WORDS_WITH_MISSING_SPACE_CHARACTER_DEMOTION_RATE 67
#define WORDS_WITH_EXCESSIVE_CHARACTER_DEMOTION_RATE 75
#define WORDS_WITH_EXCESSIVE_CHARACTER_OUT_OF_PROXIMITY_DEMOTION_RATE 75
#define WORDS_WITH_TRANSPOSED_CHARACTERS_DEMOTION_RATE 60