aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2011-12-08 05:16:04 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-12-08 05:16:04 -0800
commit599af94acd4f3375b512ae9546f08620a079c135 (patch)
treec23ed2c03e11f689e60fdc8aae37f8c61b1dc4cd
parente8a57d9812f546627bb64aaf0dc2fa68e49ccfa1 (diff)
parent92e5756dfb4c2d5f0ebd2da53ba1a8fd9f633721 (diff)
downloadlatinime-599af94acd4f3375b512ae9546f08620a079c135.tar.gz
latinime-599af94acd4f3375b512ae9546f08620a079c135.tar.xz
latinime-599af94acd4f3375b512ae9546f08620a079c135.zip
am 92e5756d: Merge "Cleanup"
* commit '92e5756dfb4c2d5f0ebd2da53ba1a8fd9f633721': Cleanup
-rw-r--r--java/src/com/android/inputmethod/latin/LatinIME.java7
1 files changed, 2 insertions, 5 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index ab41b1018..5ee69d1c4 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -2396,11 +2396,8 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
// TODO: cleanup messy flags
final boolean shouldAutoCorrect = mSettingsValues.mAutoCorrectEnabled
&& !mInputTypeNoAutoCorrect;
- mCorrectionMode = (shouldAutoCorrect && mSettingsValues.mAutoCorrectEnabled)
- ? Suggest.CORRECTION_FULL
- : (shouldAutoCorrect ? Suggest.CORRECTION_BASIC : Suggest.CORRECTION_NONE);
- mCorrectionMode = (mSettingsValues.mBigramSuggestionEnabled && shouldAutoCorrect
- && mSettingsValues.mAutoCorrectEnabled)
+ mCorrectionMode = shouldAutoCorrect ? Suggest.CORRECTION_FULL : Suggest.CORRECTION_NONE;
+ mCorrectionMode = (mSettingsValues.mBigramSuggestionEnabled && shouldAutoCorrect)
? Suggest.CORRECTION_FULL_BIGRAM : mCorrectionMode;
if (mSuggest != null) {
mSuggest.setCorrectionMode(mCorrectionMode);