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

am b5880034: Refactoring. 

* commit 'b5880034268111a094c9e684cec9cca784386140':
  Refactoring.
main
Jean Chalard 2011-12-15 10:08:25 -08:00 committed by Android Git Automerger
parent b9f71631da b588003426
commit ed6522b30b
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
java/src/com/android/inputmethod/latin/LatinIME.java
View File

@ -1586,7 +1586,6 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
mHandler.postUpdateSuggestions(); mHandler.postUpdateSuggestions();
} }
boolean pickedDefault = false;
// Handle separator // Handle separator
final InputConnection ic = getCurrentInputConnection(); final InputConnection ic = getCurrentInputConnection();
if (ic != null) { if (ic != null) {
@ -1603,13 +1602,8 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
final boolean shouldAutoCorrect = mSettingsValues.mAutoCorrectEnabled final boolean shouldAutoCorrect = mSettingsValues.mAutoCorrectEnabled
&& !mInputTypeNoAutoCorrect; && !mInputTypeNoAutoCorrect;
if (shouldAutoCorrect && primaryCode != Keyboard.CODE_SINGLE_QUOTE) { if (shouldAutoCorrect && primaryCode != Keyboard.CODE_SINGLE_QUOTE) {
pickedDefault = pickDefaultSuggestion(primaryCode); final boolean pickedDefaultSuggestion = pickDefaultSuggestion(primaryCode);
} else { if (pickedDefaultSuggestion) {
commitTyped(ic);
}
}
if (pickedDefault) {
final CharSequence autoCorrection = mWordComposer.getAutoCorrectionOrNull(); final CharSequence autoCorrection = mWordComposer.getAutoCorrectionOrNull();
final String typedWord = mWordComposer.getTypedWord(); final String typedWord = mWordComposer.getTypedWord();
if (TextUtils.isEmpty(typedWord)) { if (TextUtils.isEmpty(typedWord)) {
@ -1619,8 +1613,12 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
if (!typedWord.equals(autoCorrection)) { if (!typedWord.equals(autoCorrection)) {
// This will make the correction flash for a short while as a visual clue // This will make the correction flash for a short while as a visual clue
// to the user that auto-correction happened. // to the user that auto-correction happened.
InputConnectionCompatUtils.commitCorrection( InputConnectionCompatUtils.commitCorrection(ic,
ic, mLastSelectionEnd - typedWord.length(), typedWord, autoCorrection); mLastSelectionEnd - typedWord.length(), typedWord, autoCorrection);
}
}
} else {
commitTyped(ic);
} }
} }