diff options
| author |   Jean Chalard <jchalard@google.com> | 2014-01-27 03:22:03 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-01-27 03:22:03 -0800 |
| commit | 2a36d9bf3b99e61af4117aef3c6bc1775776636f (patch) | |
| tree | 833c727049d40e4ed790828ed89ffe11afc09f4c | |
| parent | 925f8fcf8858fee5cff2f59078e0b975e8f2f024 (diff) | |
| parent | 5b9e54c135cb1fa2ca1a5b5967a7934b789a8ed4 (diff) | |
| download | latinime-2a36d9bf3b99e61af4117aef3c6bc1775776636f.tar.gz latinime-2a36d9bf3b99e61af4117aef3c6bc1775776636f.tar.xz latinime-2a36d9bf3b99e61af4117aef3c6bc1775776636f.zip | |
am 5b9e54c1: Merge "[IL88] Simple refactoring"
* commit '5b9e54c135cb1fa2ca1a5b5967a7934b789a8ed4':
[IL88] Simple refactoring
| -rw-r--r-- | java/src/com/android/inputmethod/accessibility/AccessibilityUtils.java | 2 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/accessibility/AccessibilityUtils.java b/java/src/com/android/inputmethod/accessibility/AccessibilityUtils.java index 10fb9fef4..216a825e0 100644 --- a/java/src/com/android/inputmethod/accessibility/AccessibilityUtils.java +++ b/java/src/com/android/inputmethod/accessibility/AccessibilityUtils.java @@ -158,7 +158,7 @@ public final class AccessibilityUtils { * @param typedWord the currently typed word */ public void setAutoCorrection(final SuggestedWords suggestedWords, final String typedWord) { - if (suggestedWords != null && suggestedWords.mWillAutoCorrect) { + if (suggestedWords.mWillAutoCorrect) { mAutoCorrectionWord = suggestedWords.getWord(SuggestedWords.INDEX_OF_AUTO_CORRECTION); mTypedWord = typedWord; } else { diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index 4520283c0..ea3940e75 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -1434,7 +1434,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen final String typedWord) { if (suggestedWords.isEmpty()) { // No auto-correction is available, clear the cached values. - AccessibilityUtils.getInstance().setAutoCorrection(null, null); + AccessibilityUtils.getInstance().setAutoCorrection(SuggestedWords.EMPTY, typedWord); clearSuggestionStrip(); return; } |