nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

am 7d654d8c: Merge "Fix inconsistency with mutable settings."

Browse source 
* commit '7d654d8cae47f50127021918c24201bb1f0e9a06':
  Fix inconsistency with mutable settings.
This commit is contained in:
Jean Chalard 2013-07-31 00:39:36 -07:00 committed by Android Git Automerger
commit 81fb25aeb7
3 changed files with 69 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

111
java/src/com/android/inputmethod/latin/LatinIME.java
View file

@ -548,8 +548,9 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
} }
mSuggest = new Suggest(this /* Context */, subtypeLocale, mSuggest = new Suggest(this /* Context */, subtypeLocale,
this /* SuggestInitializationListener */); this /* SuggestInitializationListener */);
if (mSettings.getCurrent().mCorrectionEnabled) { final SettingsValues settingsValues = mSettings.getCurrent();
mSuggest.setAutoCorrectionThreshold(mSettings.getCurrent().mAutoCorrectionThreshold); if (settingsValues.mCorrectionEnabled) {
mSuggest.setAutoCorrectionThreshold(settingsValues.mAutoCorrectionThreshold);
} }
mIsMainDictionaryAvailable = DictionaryFactory.isDictionaryAvailable(this, subtypeLocale); mIsMainDictionaryAvailable = DictionaryFactory.isDictionaryAvailable(this, subtypeLocale);
@ -1216,10 +1217,11 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
private void resetEntireInputState(final int newCursorPosition) { private void resetEntireInputState(final int newCursorPosition) {
final boolean shouldFinishComposition = mWordComposer.isComposingWord(); final boolean shouldFinishComposition = mWordComposer.isComposingWord();
resetComposingState(true /* alsoResetLastComposedWord */); resetComposingState(true /* alsoResetLastComposedWord */);
if (mSettings.getCurrent().mBigramPredictionEnabled) { final SettingsValues settingsValues = mSettings.getCurrent();
if (settingsValues.mBigramPredictionEnabled) {
clearSuggestionStrip(); clearSuggestionStrip();
} else { } else {
setSuggestedWords(mSettings.getCurrent().mSuggestPuncList, false); setSuggestedWords(settingsValues.mSuggestPuncList, false);
} }
mConnection.resetCachesUponCursorMove(newCursorPosition, shouldFinishComposition); mConnection.resetCachesUponCursorMove(newCursorPosition, shouldFinishComposition);
} }
@ -1293,8 +1295,9 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
} }
private boolean maybeDoubleSpacePeriod() { private boolean maybeDoubleSpacePeriod() {
if (!mSettings.getCurrent().mCorrectionEnabled) return false; final SettingsValues settingsValues = mSettings.getCurrent();
if (!mSettings.getCurrent().mUseDoubleSpacePeriod) return false; if (!settingsValues.mCorrectionEnabled) return false;
if (!settingsValues.mUseDoubleSpacePeriod) return false;
if (!mHandler.isAcceptingDoubleSpacePeriod()) return false; if (!mHandler.isAcceptingDoubleSpacePeriod()) return false;
final CharSequence lastThree = mConnection.getTextBeforeCursor(3, 0); final CharSequence lastThree = mConnection.getTextBeforeCursor(3, 0);
if (lastThree != null && lastThree.length() == 3 if (lastThree != null && lastThree.length() == 3
@ -1554,12 +1557,13 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
final int spaceState) { final int spaceState) {
mSpaceState = SPACE_STATE_NONE; mSpaceState = SPACE_STATE_NONE;
final boolean didAutoCorrect; final boolean didAutoCorrect;
if (mSettings.getCurrent().isWordSeparator(primaryCode)) { final SettingsValues settingsValues = mSettings.getCurrent();
if (settingsValues.isWordSeparator(primaryCode)) {
didAutoCorrect = handleSeparator(primaryCode, x, y, spaceState); didAutoCorrect = handleSeparator(primaryCode, x, y, spaceState);
} else { } else {
didAutoCorrect = false; didAutoCorrect = false;
if (SPACE_STATE_PHANTOM == spaceState) { if (SPACE_STATE_PHANTOM == spaceState) {
if (mSettings.isInternal()) { if (settingsValues.mIsInternal) {
if (mWordComposer.isComposingWord() && mWordComposer.isBatchMode()) { if (mWordComposer.isComposingWord() && mWordComposer.isBatchMode()) {
LatinImeLoggerUtils.onAutoCorrection( LatinImeLoggerUtils.onAutoCorrection(
"", mWordComposer.getTypedWord(), " ", mWordComposer); "", mWordComposer.getTypedWord(), " ", mWordComposer);
@ -1619,8 +1623,9 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
BatchInputUpdater.getInstance().onStartBatchInput(this); BatchInputUpdater.getInstance().onStartBatchInput(this);
mHandler.cancelUpdateSuggestionStrip(); mHandler.cancelUpdateSuggestionStrip();
mConnection.beginBatchEdit(); mConnection.beginBatchEdit();
final SettingsValues settingsValues = mSettings.getCurrent();
if (mWordComposer.isComposingWord()) { if (mWordComposer.isComposingWord()) {
if (mSettings.isInternal()) { if (settingsValues.mIsInternal) {
if (mWordComposer.isBatchMode()) { if (mWordComposer.isBatchMode()) {
LatinImeLoggerUtils.onAutoCorrection( LatinImeLoggerUtils.onAutoCorrection(
"", mWordComposer.getTypedWord(), " ", mWordComposer); "", mWordComposer.getTypedWord(), " ", mWordComposer);
@ -1649,7 +1654,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
} }
final int codePointBeforeCursor = mConnection.getCodePointBeforeCursor(); final int codePointBeforeCursor = mConnection.getCodePointBeforeCursor();
if (Character.isLetterOrDigit(codePointBeforeCursor) if (Character.isLetterOrDigit(codePointBeforeCursor)
|| mSettings.getCurrent().isUsuallyFollowedBySpace(codePointBeforeCursor)) { || settingsValues.isUsuallyFollowedBySpace(codePointBeforeCursor)) {
mSpaceState = SPACE_STATE_PHANTOM; mSpaceState = SPACE_STATE_PHANTOM;
} }
mConnection.endBatchEdit(); mConnection.endBatchEdit();
@ -1869,8 +1874,9 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
mConnection.deleteSurroundingText(1, 0); mConnection.deleteSurroundingText(1, 0);
} }
} else { } else {
final SettingsValues currentSettings = mSettings.getCurrent();
if (mLastComposedWord.canRevertCommit()) { if (mLastComposedWord.canRevertCommit()) {
if (mSettings.isInternal()) { if (currentSettings.mIsInternal) {
LatinImeLoggerUtils.onAutoCorrectionCancellation(); LatinImeLoggerUtils.onAutoCorrectionCancellation();
} }
revertCommit(); revertCommit();
@ -1947,7 +1953,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
} }
} }
} }
if (mSettings.getCurrent().isSuggestionsRequested(mDisplayOrientation)) { if (currentSettings.isSuggestionsRequested(mDisplayOrientation)) {
restartSuggestionsOnWordBeforeCursorIfAtEndOfWord(); restartSuggestionsOnWordBeforeCursorIfAtEndOfWord();
} }
} }
@ -1964,8 +1970,9 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
} }
if ((SPACE_STATE_WEAK == spaceState || SPACE_STATE_SWAP_PUNCTUATION == spaceState) if ((SPACE_STATE_WEAK == spaceState || SPACE_STATE_SWAP_PUNCTUATION == spaceState)
&& isFromSuggestionStrip) { && isFromSuggestionStrip) {
if (mSettings.getCurrent().isUsuallyPrecededBySpace(code)) return false; final SettingsValues currentSettings = mSettings.getCurrent();
if (mSettings.getCurrent().isUsuallyFollowedBySpace(code)) return true; if (currentSettings.isUsuallyPrecededBySpace(code)) return false;
if (currentSettings.isUsuallyFollowedBySpace(code)) return true;
mConnection.removeTrailingSpace(); mConnection.removeTrailingSpace();
} }
return false; return false;
@ -1977,8 +1984,8 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
// TODO: remove isWordConnector() and use isUsuallyFollowedBySpace() instead. // TODO: remove isWordConnector() and use isUsuallyFollowedBySpace() instead.
// See onStartBatchInput() to see how to do it. // See onStartBatchInput() to see how to do it.
if (SPACE_STATE_PHANTOM == spaceState && final SettingsValues currentSettings = mSettings.getCurrent();
!mSettings.getCurrent().isWordConnector(primaryCode)) { if (SPACE_STATE_PHANTOM == spaceState && !currentSettings.isWordConnector(primaryCode)) {
if (isComposingWord) { if (isComposingWord) {
// Sanity check // Sanity check
throw new RuntimeException("Should not be composing here"); throw new RuntimeException("Should not be composing here");
@ -1996,9 +2003,9 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
// dozen milliseconds. Avoid calling it as much as possible, since we are on the UI // dozen milliseconds. Avoid calling it as much as possible, since we are on the UI
// thread here. // thread here.
if (!isComposingWord && (isAlphabet(primaryCode) if (!isComposingWord && (isAlphabet(primaryCode)
|| mSettings.getCurrent().isWordConnector(primaryCode)) || currentSettings.isWordConnector(primaryCode))
&& mSettings.getCurrent().isSuggestionsRequested(mDisplayOrientation) && && currentSettings.isSuggestionsRequested(mDisplayOrientation) &&
!mConnection.isCursorTouchingWord(mSettings.getCurrent())) { !mConnection.isCursorTouchingWord(currentSettings)) {
// Reset entirely the composing state anyway, then start composing a new word unless // Reset entirely the composing state anyway, then start composing a new word unless
// the character is a single quote. The idea here is, single quote is not a // the character is a single quote. The idea here is, single quote is not a
// separator and it should be treated as a normal character, except in the first // separator and it should be treated as a normal character, except in the first
@ -2041,7 +2048,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
if (null != mSuggestionStripView) mSuggestionStripView.dismissAddToDictionaryHint(); if (null != mSuggestionStripView) mSuggestionStripView.dismissAddToDictionaryHint();
} }
mHandler.postUpdateSuggestionStrip(); mHandler.postUpdateSuggestionStrip();
if (mSettings.isInternal()) { if (currentSettings.mIsInternal) {
LatinImeLoggerUtils.onNonSeparator((char)primaryCode, x, y); LatinImeLoggerUtils.onNonSeparator((char)primaryCode, x, y);
} }
} }
@ -2054,9 +2061,10 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
final CharSequence selectedText = final CharSequence selectedText =
mConnection.getSelectedText(0 /* flags, 0 for no styles */); mConnection.getSelectedText(0 /* flags, 0 for no styles */);
if (TextUtils.isEmpty(selectedText)) return; // Race condition with the input connection if (TextUtils.isEmpty(selectedText)) return; // Race condition with the input connection
final SettingsValues currentSettings = mSettings.getCurrent();
mRecapitalizeStatus.initialize(mLastSelectionStart, mLastSelectionEnd, mRecapitalizeStatus.initialize(mLastSelectionStart, mLastSelectionEnd,
selectedText.toString(), mSettings.getCurrentLocale(), selectedText.toString(), currentSettings.mLocale,
mSettings.getWordSeparators()); currentSettings.mWordSeparators);
// We trim leading and trailing whitespace. // We trim leading and trailing whitespace.
mRecapitalizeStatus.trim(); mRecapitalizeStatus.trim();
// Trimming the object may have changed the length of the string, and we need to // Trimming the object may have changed the length of the string, and we need to
@ -2090,8 +2098,9 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
// first so that we can insert the separator at the current cursor position. // first so that we can insert the separator at the current cursor position.
resetEntireInputState(mLastSelectionStart); resetEntireInputState(mLastSelectionStart);
} }
final SettingsValues currentSettings = mSettings.getCurrent();
if (mWordComposer.isComposingWord()) { if (mWordComposer.isComposingWord()) {
if (mSettings.getCurrent().mCorrectionEnabled) { if (currentSettings.mCorrectionEnabled) {
// TODO: maybe cache Strings in an <String> sparse array or something // TODO: maybe cache Strings in an <String> sparse array or something
commitCurrentAutoCorrection(new String(new int[]{primaryCode}, 0, 1)); commitCurrentAutoCorrection(new String(new int[]{primaryCode}, 0, 1));
didAutoCorrect = true; didAutoCorrect = true;
@ -2104,7 +2113,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
Constants.SUGGESTION_STRIP_COORDINATE == x); Constants.SUGGESTION_STRIP_COORDINATE == x);
if (SPACE_STATE_PHANTOM == spaceState && if (SPACE_STATE_PHANTOM == spaceState &&
mSettings.getCurrent().isUsuallyPrecededBySpace(primaryCode)) { currentSettings.isUsuallyPrecededBySpace(primaryCode)) {
promotePhantomSpace(); promotePhantomSpace();
} }
if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) { if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) {
@ -2113,7 +2122,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
sendKeyCodePoint(primaryCode); sendKeyCodePoint(primaryCode);
if (Constants.CODE_SPACE == primaryCode) { if (Constants.CODE_SPACE == primaryCode) {
if (mSettings.getCurrent().isSuggestionsRequested(mDisplayOrientation)) { if (currentSettings.isSuggestionsRequested(mDisplayOrientation)) {
if (maybeDoubleSpacePeriod()) { if (maybeDoubleSpacePeriod()) {
mSpaceState = SPACE_STATE_DOUBLE; mSpaceState = SPACE_STATE_DOUBLE;
} else if (!isShowingPunctuationList()) { } else if (!isShowingPunctuationList()) {
@ -2128,7 +2137,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
swapSwapperAndSpace(); swapSwapperAndSpace();
mSpaceState = SPACE_STATE_SWAP_PUNCTUATION; mSpaceState = SPACE_STATE_SWAP_PUNCTUATION;
} else if (SPACE_STATE_PHANTOM == spaceState } else if (SPACE_STATE_PHANTOM == spaceState
&& mSettings.getCurrent().isUsuallyFollowedBySpace(primaryCode)) { && currentSettings.isUsuallyFollowedBySpace(primaryCode)) {
// If we are in phantom space state, and the user presses a separator, we want to // If we are in phantom space state, and the user presses a separator, we want to
// stay in phantom space state so that the next keypress has a chance to add the // stay in phantom space state so that the next keypress has a chance to add the
// space. For example, if I type "Good dat", pick "day" from the suggestion strip // space. For example, if I type "Good dat", pick "day" from the suggestion strip
@ -2146,7 +2155,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
// already displayed or not, so it's okay. // already displayed or not, so it's okay.
setPunctuationSuggestions(); setPunctuationSuggestions();
} }
if (mSettings.isInternal()) { if (currentSettings.mIsInternal) {
LatinImeLoggerUtils.onSeparator((char)primaryCode, x, y); LatinImeLoggerUtils.onSeparator((char)primaryCode, x, y);
} }
@ -2179,17 +2188,18 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
} }
private boolean isSuggestionsStripVisible() { private boolean isSuggestionsStripVisible() {
final SettingsValues currentSettings = mSettings.getCurrent();
if (mSuggestionStripView == null) if (mSuggestionStripView == null)
return false; return false;
if (mSuggestionStripView.isShowingAddToDictionaryHint()) if (mSuggestionStripView.isShowingAddToDictionaryHint())
return true; return true;
if (null == mSettings.getCurrent()) if (null == currentSettings)
return false; return false;
if (!mSettings.getCurrent().isSuggestionStripVisibleInOrientation(mDisplayOrientation)) if (!currentSettings.isSuggestionStripVisibleInOrientation(mDisplayOrientation))
return false; return false;
if (mSettings.getCurrent().isApplicationSpecifiedCompletionsOn()) if (currentSettings.isApplicationSpecifiedCompletionsOn())
return true; return true;
return mSettings.getCurrent().isSuggestionsRequested(mDisplayOrientation); return currentSettings.isSuggestionsRequested(mDisplayOrientation);
} }
private void clearSuggestionStrip() { private void clearSuggestionStrip() {
@ -2222,10 +2232,11 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
private void updateSuggestionStrip() { private void updateSuggestionStrip() {
mHandler.cancelUpdateSuggestionStrip(); mHandler.cancelUpdateSuggestionStrip();
final SettingsValues currentSettings = mSettings.getCurrent();
// Check if we have a suggestion engine attached. // Check if we have a suggestion engine attached.
if (mSuggest == null if (mSuggest == null
|| !mSettings.getCurrent().isSuggestionsRequested(mDisplayOrientation)) { || !currentSettings.isSuggestionsRequested(mDisplayOrientation)) {
if (mWordComposer.isComposingWord()) { if (mWordComposer.isComposingWord()) {
Log.w(TAG, "Called updateSuggestionsOrPredictions but suggestions were not " Log.w(TAG, "Called updateSuggestionsOrPredictions but suggestions were not "
+ "requested!"); + "requested!");
@ -2233,7 +2244,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
return; return;
} }
if (!mWordComposer.isComposingWord() && !mSettings.getCurrent().mBigramPredictionEnabled) { if (!mWordComposer.isComposingWord() && !currentSettings.mBigramPredictionEnabled) {
setPunctuationSuggestions(); setPunctuationSuggestions();
return; return;
} }
@ -2254,12 +2265,13 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
// whatever is *before* the half-committed word in the buffer, hence 2; if we aren't, we // whatever is *before* the half-committed word in the buffer, hence 2; if we aren't, we
// should just skip whitespace if any, so 1. // should just skip whitespace if any, so 1.
// TODO: this is slow (2-way IPC) - we should probably cache this instead. // TODO: this is slow (2-way IPC) - we should probably cache this instead.
final SettingsValues currentSettings = mSettings.getCurrent();
final String prevWord = final String prevWord =
mConnection.getNthPreviousWord(mSettings.getCurrent().mWordSeparators, mConnection.getNthPreviousWord(currentSettings.mWordSeparators,
mWordComposer.isComposingWord() ? 2 : 1); mWordComposer.isComposingWord() ? 2 : 1);
return suggest.getSuggestedWords(mWordComposer, prevWord, keyboard.getProximityInfo(), return suggest.getSuggestedWords(mWordComposer, prevWord, keyboard.getProximityInfo(),
mSettings.getBlockPotentiallyOffensive(), currentSettings.mBlockPotentiallyOffensive,
mSettings.getCurrent().mCorrectionEnabled, sessionId); currentSettings.mCorrectionEnabled, sessionId);
} }
private SuggestedWords getSuggestedWordsOrOlderSuggestions(final int sessionId) { private SuggestedWords getSuggestedWordsOrOlderSuggestions(final int sessionId) {
@ -2385,18 +2397,19 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
} }
mConnection.beginBatchEdit(); mConnection.beginBatchEdit();
final SettingsValues currentSettings = mSettings.getCurrent();
if (SPACE_STATE_PHANTOM == mSpaceState && suggestion.length() > 0 if (SPACE_STATE_PHANTOM == mSpaceState && suggestion.length() > 0
// In the batch input mode, a manually picked suggested word should just replace // In the batch input mode, a manually picked suggested word should just replace
// the current batch input text and there is no need for a phantom space. // the current batch input text and there is no need for a phantom space.
&& !mWordComposer.isBatchMode()) { && !mWordComposer.isBatchMode()) {
final int firstChar = Character.codePointAt(suggestion, 0); final int firstChar = Character.codePointAt(suggestion, 0);
if (!mSettings.getCurrent().isWordSeparator(firstChar) if (!currentSettings.isWordSeparator(firstChar)
|| mSettings.getCurrent().isUsuallyPrecededBySpace(firstChar)) { || currentSettings.isUsuallyPrecededBySpace(firstChar)) {
promotePhantomSpace(); promotePhantomSpace();
} }
} }
if (mSettings.getCurrent().isApplicationSpecifiedCompletionsOn() if (currentSettings.isApplicationSpecifiedCompletionsOn()
&& mApplicationSpecifiedCompletions != null && mApplicationSpecifiedCompletions != null
&& index >= 0 && index < mApplicationSpecifiedCompletions.length) { && index >= 0 && index < mApplicationSpecifiedCompletions.length) {
mSuggestedWords = SuggestedWords.EMPTY; mSuggestedWords = SuggestedWords.EMPTY;
@ -2441,13 +2454,13 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
// If the suggestion is not in the dictionary, the hint should be shown. // If the suggestion is not in the dictionary, the hint should be shown.
&& !AutoCorrectionUtils.isValidWord(mSuggest, suggestion, true); && !AutoCorrectionUtils.isValidWord(mSuggest, suggestion, true);
if (mSettings.isInternal()) { if (currentSettings.mIsInternal) {
LatinImeLoggerUtils.onSeparator((char)Constants.CODE_SPACE, LatinImeLoggerUtils.onSeparator((char)Constants.CODE_SPACE,
Constants.NOT_A_COORDINATE, Constants.NOT_A_COORDINATE); Constants.NOT_A_COORDINATE, Constants.NOT_A_COORDINATE);
} }
if (showingAddToDictionaryHint && mIsUserDictionaryAvailable) { if (showingAddToDictionaryHint && mIsUserDictionaryAvailable) {
mSuggestionStripView.showAddToDictionaryHint( mSuggestionStripView.showAddToDictionaryHint(
suggestion, mSettings.getCurrent().mHintToSaveText); suggestion, currentSettings.mHintToSaveText);
} else { } else {
// If we're not showing the "Touch again to save", then update the suggestion strip. // If we're not showing the "Touch again to save", then update the suggestion strip.
mHandler.postUpdateSuggestionStrip(); mHandler.postUpdateSuggestionStrip();
@ -2473,10 +2486,11 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
} }
private void setPunctuationSuggestions() { private void setPunctuationSuggestions() {
if (mSettings.getCurrent().mBigramPredictionEnabled) { final SettingsValues currentSettings = mSettings.getCurrent();
if (currentSettings.mBigramPredictionEnabled) {
clearSuggestionStrip(); clearSuggestionStrip();
} else { } else {
setSuggestedWords(mSettings.getCurrent().mSuggestPuncList, false); setSuggestedWords(currentSettings.mSuggestPuncList, false);
} }
setAutoCorrectionIndicator(false); setAutoCorrectionIndicator(false);
setSuggestionStripShown(isSuggestionsStripVisible()); setSuggestionStripShown(isSuggestionsStripVisible());
@ -2489,7 +2503,8 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
// If correction is not enabled, we don't add words to the user history dictionary. // If correction is not enabled, we don't add words to the user history dictionary.
// That's to avoid unintended additions in some sensitive fields, or fields that // That's to avoid unintended additions in some sensitive fields, or fields that
// expect to receive non-words. // expect to receive non-words.
if (!mSettings.getCurrent().mCorrectionEnabled) return null; final SettingsValues currentSettings = mSettings.getCurrent();
if (!currentSettings.mCorrectionEnabled) return null;
final Suggest suggest = mSuggest; final Suggest suggest = mSuggest;
final UserHistoryDictionary userHistoryDictionary = mUserHistoryDictionary; final UserHistoryDictionary userHistoryDictionary = mUserHistoryDictionary;
@ -2497,8 +2512,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
// Avoid concurrent issue // Avoid concurrent issue
return null; return null;
} }
final String prevWord final String prevWord = mConnection.getNthPreviousWord(currentSettings.mWordSeparators, 2);
= mConnection.getNthPreviousWord(mSettings.getCurrent().mWordSeparators, 2);
final String secondWord; final String secondWord;
if (mWordComposer.wasAutoCapitalized() && !mWordComposer.isMostlyCaps()) { if (mWordComposer.wasAutoCapitalized() && !mWordComposer.isMostlyCaps()) {
secondWord = suggestion.toLowerCase(mSubtypeSwitcher.getCurrentSubtypeLocale()); secondWord = suggestion.toLowerCase(mSubtypeSwitcher.getCurrentSubtypeLocale());
@ -2527,8 +2541,9 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
if (mLastSelectionStart != mLastSelectionEnd) return; if (mLastSelectionStart != mLastSelectionEnd) return;
// If we don't know the cursor location, return. // If we don't know the cursor location, return.
if (mLastSelectionStart < 0) return; if (mLastSelectionStart < 0) return;
if (!mConnection.isCursorTouchingWord(mSettings.getCurrent())) return; final SettingsValues currentSettings = mSettings.getCurrent();
final TextRange range = mConnection.getWordRangeAtCursor(mSettings.getWordSeparators(), if (!mConnection.isCursorTouchingWord(currentSettings)) return;
final TextRange range = mConnection.getWordRangeAtCursor(currentSettings.mWordSeparators,
0 /* additionalPrecedingWordsCount */); 0 /* additionalPrecedingWordsCount */);
if (null == range) return; // Happens if we don't have an input connection at all if (null == range) return; // Happens if we don't have an input connection at all
// If for some strange reason (editor bug or so) we measure the text before the cursor as // If for some strange reason (editor bug or so) we measure the text before the cursor as

10
java/src/com/android/inputmethod/latin/settings/Settings.java
View file

@ -93,7 +93,6 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang
private Resources mRes; private Resources mRes;
private SharedPreferences mPrefs; private SharedPreferences mPrefs;
private Locale mCurrentLocale;
private SettingsValues mSettingsValues; private SettingsValues mSettingsValues;
private static final Settings sInstance = new Settings(); private static final Settings sInstance = new Settings();
@ -128,16 +127,15 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang
Log.w(TAG, "onSharedPreferenceChanged called before loadSettings."); Log.w(TAG, "onSharedPreferenceChanged called before loadSettings.");
return; return;
} }
loadSettings(mCurrentLocale, mSettingsValues.mInputAttributes); loadSettings(mSettingsValues.mLocale, mSettingsValues.mInputAttributes);
} }
public void loadSettings(final Locale locale, final InputAttributes inputAttributes) { public void loadSettings(final Locale locale, final InputAttributes inputAttributes) {
mCurrentLocale = locale;
final SharedPreferences prefs = mPrefs; final SharedPreferences prefs = mPrefs;
final RunInLocale<SettingsValues> job = new RunInLocale<SettingsValues>() { final RunInLocale<SettingsValues> job = new RunInLocale<SettingsValues>() {
@Override @Override
protected SettingsValues job(final Resources res) { protected SettingsValues job(final Resources res) {
return new SettingsValues(prefs, res, inputAttributes); return new SettingsValues(prefs, locale, res, inputAttributes);
} }
}; };
mSettingsValues = job.runInLocale(mRes, locale); mSettingsValues = job.runInLocale(mRes, locale);
@ -160,10 +158,6 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang
return mSettingsValues.isWordSeparator(code); return mSettingsValues.isWordSeparator(code);
} }
public Locale getCurrentLocale() {
return mCurrentLocale;
}
public boolean getBlockPotentiallyOffensive() { public boolean getBlockPotentiallyOffensive() {
return mSettingsValues.mBlockPotentiallyOffensive; return mSettingsValues.mBlockPotentiallyOffensive;
} }

5
java/src/com/android/inputmethod/latin/settings/SettingsValues.java
View file

@ -37,6 +37,7 @@ import com.android.inputmethod.latin.utils.StringUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Locale;
/** /**
* When you call the constructor of this class, you may want to change the current system locale by * When you call the constructor of this class, you may want to change the current system locale by
@ -75,6 +76,7 @@ public final class SettingsValues {
public final boolean mGestureFloatingPreviewTextEnabled; public final boolean mGestureFloatingPreviewTextEnabled;
public final boolean mSlidingKeyInputPreviewEnabled; public final boolean mSlidingKeyInputPreviewEnabled;
public final int mKeyLongpressTimeout; public final int mKeyLongpressTimeout;
public final Locale mLocale;
// From the input box // From the input box
public final InputAttributes mInputAttributes; public final InputAttributes mInputAttributes;
@ -97,8 +99,9 @@ public final class SettingsValues {
// Debug settings // Debug settings
public final boolean mIsInternal; public final boolean mIsInternal;
public SettingsValues(final SharedPreferences prefs, final Resources res, public SettingsValues(final SharedPreferences prefs, final Locale locale, final Resources res,
final InputAttributes inputAttributes) { final InputAttributes inputAttributes) {
mLocale = locale;
// Get the resources // Get the resources
mDelayUpdateOldSuggestions = res.getInteger(R.integer.config_delay_update_old_suggestions); mDelayUpdateOldSuggestions = res.getInteger(R.integer.config_delay_update_old_suggestions);
mSymbolsPrecededBySpace = mSymbolsPrecededBySpace =