aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2012-03-09 21:10:55 +0900
committerJean Chalard <jchalard@google.com>2012-03-09 21:10:55 +0900
commit28e59b98c6b8601a1b515c7332f3ada1c149ca5f (patch)
treedd65851b2e74eefa4c414b2bca1ebab3c87bea8d /java/src
parentd5f618e90a6ad8d508a6b5b06a308d0f66456e65 (diff)
downloadlatinime-28e59b98c6b8601a1b515c7332f3ada1c149ca5f.tar.gz
latinime-28e59b98c6b8601a1b515c7332f3ada1c149ca5f.tar.xz
latinime-28e59b98c6b8601a1b515c7332f3ada1c149ca5f.zip
Remove a useless escape
Change-Id: I1ef0685cc9888c9cef9f60015d32b66dde75ef9b
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/latin/Suggest.java7
-rw-r--r--java/src/com/android/inputmethod/latin/SuggestedWords.java4
2 files changed, 4 insertions, 7 deletions
diff --git a/java/src/com/android/inputmethod/latin/Suggest.java b/java/src/com/android/inputmethod/latin/Suggest.java
index 6230b4224..3d6d5a776 100644
--- a/java/src/com/android/inputmethod/latin/Suggest.java
+++ b/java/src/com/android/inputmethod/latin/Suggest.java
@@ -454,7 +454,8 @@ public class Suggest implements Dictionary.WordCallback {
autoCorrectionAvailable &= !wordComposer.isMostlyCaps();
builder.setTypedWordValid(!allowsToBeAutoCorrected).setHasMinimalSuggestion(
autoCorrectionAvailable);
- if (Suggest.shouldBlockAutoCorrectionBySafetyNet(builder, this, mAutoCorrectionThreshold)) {
+ if (Suggest.shouldBlockAutoCorrectionBySafetyNet(builder, this, mAutoCorrectionThreshold,
+ !allowsToBeAutoCorrected)) {
builder.setShouldBlockAutoCorrectionBySafetyNet();
}
return builder;
@@ -609,10 +610,10 @@ public class Suggest implements Dictionary.WordCallback {
// this safety net
public static boolean shouldBlockAutoCorrectionBySafetyNet(
final SuggestedWords.Builder suggestedWordsBuilder, final Suggest suggest,
- final double autoCorrectionThreshold) {
+ final double autoCorrectionThreshold, final boolean isTypedWordValid) {
// Safety net for auto correction.
// Actually if we hit this safety net, it's actually a bug.
- if (suggestedWordsBuilder.size() <= 1 || suggestedWordsBuilder.isTypedWordValid()) {
+ if (suggestedWordsBuilder.size() <= 1 || isTypedWordValid) {
return false;
}
// If user selected aggressive auto correction mode, there is no need to use the safety
diff --git a/java/src/com/android/inputmethod/latin/SuggestedWords.java b/java/src/com/android/inputmethod/latin/SuggestedWords.java
index 9549c79a4..2018bcac7 100644
--- a/java/src/com/android/inputmethod/latin/SuggestedWords.java
+++ b/java/src/com/android/inputmethod/latin/SuggestedWords.java
@@ -208,10 +208,6 @@ public class SuggestedWords {
return mWords.get(pos);
}
- public boolean isTypedWordValid() {
- return mTypedWordValid;
- }
-
public boolean allowsToBeAutoCorrected() {
return mAllowsToBeAutoCorrected;
}