am 27ad0194: Merge "A simplification."
* commit '27ad01947affc8797bb759354ec705f96f17ca90': A simplification.main
commit
642198ef2d
|
@ -2565,16 +2565,9 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
|
||||||
final SettingsValues currentSettings = mSettings.getCurrent();
|
final SettingsValues currentSettings = mSettings.getCurrent();
|
||||||
final int[] additionalFeaturesOptions = currentSettings.mAdditionalFeaturesSettingValues;
|
final int[] additionalFeaturesOptions = currentSettings.mAdditionalFeaturesSettingValues;
|
||||||
|
|
||||||
final String previousWord;
|
|
||||||
if (mWordComposer.isComposingWord() || mWordComposer.isBatchMode()) {
|
|
||||||
previousWord = mWordComposer.getPreviousWord();
|
|
||||||
} else {
|
|
||||||
// Not composing: this is for prediction.
|
|
||||||
// TODO: read the previous word earlier for prediction, like we are doing for
|
|
||||||
// normal suggestions.
|
|
||||||
previousWord = getNthPreviousWordForSuggestion(currentSettings, 1 /* nthPreviousWord*/);
|
|
||||||
}
|
|
||||||
if (DEBUG) {
|
if (DEBUG) {
|
||||||
|
if (mWordComposer.isComposingWord() || mWordComposer.isBatchMode()) {
|
||||||
|
final String previousWord = mWordComposer.getPreviousWord();
|
||||||
// TODO: this is for checking consistency with older versions. Remove this when
|
// TODO: this is for checking consistency with older versions. Remove this when
|
||||||
// we are confident this is stable.
|
// we are confident this is stable.
|
||||||
// We're checking the previous word in the text field against the memorized previous
|
// We're checking the previous word in the text field against the memorized previous
|
||||||
|
@ -2587,6 +2580,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
|
||||||
+ previousWord + " <> " + rereadPrevWord);
|
+ previousWord + " <> " + rereadPrevWord);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
suggest.getSuggestedWords(mWordComposer, mWordComposer.getPreviousWord(),
|
suggest.getSuggestedWords(mWordComposer, mWordComposer.getPreviousWord(),
|
||||||
keyboard.getProximityInfo(),
|
keyboard.getProximityInfo(),
|
||||||
currentSettings.mBlockPotentiallyOffensive, currentSettings.mCorrectionEnabled,
|
currentSettings.mBlockPotentiallyOffensive, currentSettings.mCorrectionEnabled,
|
||||||
|
|
Loading…
Reference in New Issue