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

Enable re-correction even after revert auto-correction

Browse source 
This change removes the boolean flag mJustReverted.  Because we
preserve separator after canceling auto-correction according to
bug#3230708, there is no need for this flag now.

Bug: 3193810
Change-Id: Icea06ece569774b494ffa4ca4a899c898661cc19
This commit is contained in:
Tadashi G. Takaoka 2011-03-02 10:48:45 -08:00
parent 8bf93c4ba5
commit 6f99d12b07
1 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -193,7 +193,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
// Indicates whether the suggestion strip is to be on in landscape // Indicates whether the suggestion strip is to be on in landscape
private boolean mJustAccepted; private boolean mJustAccepted;
private boolean mJustReverted;
private int mDeleteCount; private int mDeleteCount;
private long mLastKeyTime; private long mLastKeyTime;
@ -769,7 +768,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
// Don't look for corrections if the keyboard is not visible // Don't look for corrections if the keyboard is not visible
if (mKeyboardSwitcher.isInputViewShown()) { if (mKeyboardSwitcher.isInputViewShown()) {
// Check if we should go in or out of correction mode. // Check if we should go in or out of correction mode.
if (isSuggestionsRequested() && !mJustReverted if (isSuggestionsRequested()
&& (candidatesStart == candidatesEnd || newSelStart != oldSelStart && (candidatesStart == candidatesEnd || newSelStart != oldSelStart
|| TextEntryState.isRecorrecting()) || TextEntryState.isRecorrecting())
&& (newSelStart < newSelEnd - 1 || !mHasValidSuggestions)) { && (newSelStart < newSelEnd - 1 || !mHasValidSuggestions)) {
@ -1174,8 +1173,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
} else { } else {
handleCharacter(primaryCode, keyCodes, x, y); handleCharacter(primaryCode, keyCodes, x, y);
} }
// Cancel the just reverted state
mJustReverted = false;
} }
switcher.onKey(primaryCode); switcher.onKey(primaryCode);
// Reset after any single keystroke // Reset after any single keystroke
@ -1195,7 +1192,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
ic.endBatchEdit(); ic.endBatchEdit();
mKeyboardSwitcher.updateShiftState(); mKeyboardSwitcher.updateShiftState();
mKeyboardSwitcher.onKey(Keyboard.CODE_DUMMY); mKeyboardSwitcher.onKey(Keyboard.CODE_DUMMY);
mJustReverted = false;
mJustAddedAutoSpace = false; mJustAddedAutoSpace = false;
mEnteredText = text; mEnteredText = text;
} }
@ -1260,7 +1256,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
} }
} }
} }
mJustReverted = false;
ic.endBatchEdit(); ic.endBatchEdit();
} }
@ -1377,7 +1372,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
// not to auto correct, but accept the typed word. For instance, // not to auto correct, but accept the typed word. For instance,
// in Italian dov' should not be expanded to dove' because the elision // in Italian dov' should not be expanded to dove' because the elision
// requires the last vowel to be removed. // requires the last vowel to be removed.
if (mAutoCorrectOn && primaryCode != '\'' && !mJustReverted) { if (mAutoCorrectOn && primaryCode != '\'') {
pickedDefault = pickDefaultSuggestion(); pickedDefault = pickDefaultSuggestion();
// Picked the suggestion by the space key. We consider this // Picked the suggestion by the space key. We consider this
// as "added an auto space". // as "added an auto space".
@ -1549,8 +1544,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
SuggestedWords.Builder builder = mSuggest.getSuggestedWordBuilder( SuggestedWords.Builder builder = mSuggest.getSuggestedWordBuilder(
mKeyboardSwitcher.getInputView(), word, prevWord); mKeyboardSwitcher.getInputView(), word, prevWord);
boolean correctionAvailable = !mInputTypeNoAutoCorrect && !mJustReverted boolean correctionAvailable = !mInputTypeNoAutoCorrect && mSuggest.hasAutoCorrection();
&& mSuggest.hasAutoCorrection();
final CharSequence typedWord = word.getTypedWord(); final CharSequence typedWord = word.getTypedWord();
// If we're in basic correct // If we're in basic correct
final boolean typedWordValid = mSuggest.isValidWord(typedWord) || final boolean typedWordValid = mSuggest.isValidWord(typedWord) ||
@ -1880,7 +1874,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
final int length = mComposing.length(); final int length = mComposing.length();
if (!mHasValidSuggestions && length > 0) { if (!mHasValidSuggestions && length > 0) {
final InputConnection ic = getCurrentInputConnection(); final InputConnection ic = getCurrentInputConnection();
mJustReverted = true;
final CharSequence punctuation = ic.getTextBeforeCursor(1, 0); final CharSequence punctuation = ic.getTextBeforeCursor(1, 0);
if (deleteChar) ic.deleteSurroundingText(1, 0); if (deleteChar) ic.deleteSurroundingText(1, 0);
int toDelete = mCommittedLength; int toDelete = mCommittedLength;
@ -1908,7 +1901,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
mHandler.postUpdateSuggestions(); mHandler.postUpdateSuggestions();
} else { } else {
sendDownUpKeyEvents(KeyEvent.KEYCODE_DEL); sendDownUpKeyEvents(KeyEvent.KEYCODE_DEL);
mJustReverted = false;
} }
} }