From 2f3a694e29ad5a63052a2f963327855fee099f55 Mon Sep 17 00:00:00 2001
From: Jean Chalard <jchalard@google.com>
Date: Sat, 16 Jun 2012 10:59:12 +0900
Subject: [PATCH] Cleanup, part 7 (C7)
Change-Id: I662be9d3b31fb9e157722f38cab1e6fb8a1152ab
---
.../com/android/inputmethod/latin/LatinIME.java | 6 ++----
.../android/inputmethod/latin/SettingsValues.java | 14 +++-----------
2 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 02b9666253..48f93c5a27 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1076,7 +1076,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
}
private boolean maybeDoubleSpace() {
- if (mCurrentSettings.mCorrectionMode == Suggest.CORRECTION_NONE) return false;
+ if (!mCurrentSettings.mCorrectionEnabled) return false;
if (!mHandler.isAcceptingDoubleSpaces()) return false;
final CharSequence lastThree = mConnection.getTextBeforeCursor(3, 0);
if (lastThree != null && lastThree.length() == 3
@@ -1864,8 +1864,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
// - There is a dictionary and the word is not in it
// Please note that if mSuggest is null, it means that everything is off: suggestion
// and correction, so we shouldn't try to show the hint
- // We used to look at mCorrectionMode here, but showing the hint should have nothing
- // to do with the autocorrection setting.
final boolean showingAddToDictionaryHint = index == 0 && mSuggest != null
// If there is no dictionary the hint should be shown.
&& (!mSuggest.hasMainDictionary()
@@ -2220,7 +2218,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
p.println(" Keyboard mode = " + keyboardMode);
p.println(" mIsSuggestionsSuggestionsRequested = "
+ mCurrentSettings.isSuggestionsRequested(mDisplayOrientation));
- p.println(" mCorrectionMode=" + mCurrentSettings.mCorrectionMode);
+ p.println(" mCorrectionEnabled=" + mCurrentSettings.mCorrectionEnabled);
p.println(" isComposingWord=" + mWordComposer.isComposingWord());
p.println(" isCorrectionOn=" + mCurrentSettings.isCorrectionOn());
p.println(" mSoundOn=" + mCurrentSettings.mSoundOn);
diff --git a/java/src/com/android/inputmethod/latin/SettingsValues.java b/java/src/com/android/inputmethod/latin/SettingsValues.java
index 53f2dfcdb0..bc33b173a9 100644
--- a/java/src/com/android/inputmethod/latin/SettingsValues.java
+++ b/java/src/com/android/inputmethod/latin/SettingsValues.java
@@ -94,7 +94,7 @@ public class SettingsValues {
public final int mKeyPreviewPopupDismissDelay;
private final boolean mAutoCorrectEnabled;
public final float mAutoCorrectionThreshold;
- public final int mCorrectionMode;
+ public final boolean mCorrectionEnabled;
public final int mSuggestionVisibility;
private final boolean mVoiceKeyEnabled;
private final boolean mVoiceKeyOnMain;
@@ -172,7 +172,7 @@ public class SettingsValues {
mVoiceKeyOnMain = mVoiceMode != null && mVoiceMode.equals(voiceModeMain);
mAdditionalSubtypes = AdditionalSubtype.createAdditionalSubtypesArray(
getPrefAdditionalSubtypes(prefs, res));
- mCorrectionMode = createCorrectionMode();
+ mCorrectionEnabled = mAutoCorrectEnabled && !mInputAttributes.mInputTypeNoAutoCorrect;
mSuggestionVisibility = createSuggestionVisibility(res);
}
@@ -206,14 +206,6 @@ public class SettingsValues {
return wordSeparators;
}
- private int createCorrectionMode() {
- if (mAutoCorrectEnabled && !mInputAttributes.mInputTypeNoAutoCorrect) {
- return Suggest.CORRECTION_FULL;
- } else {
- return Suggest.CORRECTION_NONE;
- }
- }
-
private int createSuggestionVisibility(final Resources res) {
final String suggestionVisiblityStr = mShowSuggestionsSetting;
for (int visibility : SUGGESTION_VISIBILITY_VALUE_ARRAY) {
@@ -245,7 +237,7 @@ public class SettingsValues {
}
public boolean isCorrectionOn() {
- return mCorrectionMode == Suggest.CORRECTION_FULL;
+ return mCorrectionEnabled;
}
public boolean isSuggestionStripVisibleInOrientation(final int orientation) {
--
GitLab