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

am 397f6f82: Merge "Small refactoring" 

* commit '397f6f8299a8acd645e4cc88eead7a345c198044':
  Small refactoring
main
Jean Chalard 2011-10-02 23:14:45 -07:00 committed by Android Git Automerger
parent b9d0c04930 397f6f8299
commit c132e93592
1 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -882,15 +882,16 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
final boolean selectionChanged = (newSelStart != candidatesEnd final boolean selectionChanged = (newSelStart != candidatesEnd
|| newSelEnd != candidatesEnd) && mLastSelectionStart != newSelStart; || newSelEnd != candidatesEnd) && mLastSelectionStart != newSelStart;
final boolean candidatesCleared = candidatesStart == -1 && candidatesEnd == -1; final boolean candidatesCleared = candidatesStart == -1 && candidatesEnd == -1;
if (!mExpectingUpdateSelection if (!mExpectingUpdateSelection) {
&& ((mComposingStringBuilder.length() > 0 && mHasUncommittedTypedChars) if (((mComposingStringBuilder.length() > 0 && mHasUncommittedTypedChars)
|| mVoiceProxy.isVoiceInputHighlighted()) || mVoiceProxy.isVoiceInputHighlighted())
&& (selectionChanged || candidatesCleared)) { && (selectionChanged || candidatesCleared)) {
if (candidatesCleared) { if (candidatesCleared) {
// If the composing span has been cleared, save the typed word in the history for // If the composing span has been cleared, save the typed word in the history
// recorrection before we reset the suggestions strip. Then, we'll be able to show // for recorrection before we reset the suggestions strip. Then, we'll be able
// suggestions for recorrection right away. // to show suggestions for recorrection right away.
mRecorrection.saveRecorrectionSuggestion(mWordComposer, mComposingStringBuilder); mRecorrection.saveRecorrectionSuggestion(mWordComposer,
mComposingStringBuilder);
} }
mComposingStringBuilder.setLength(0); mComposingStringBuilder.setLength(0);
mHasUncommittedTypedChars = false; mHasUncommittedTypedChars = false;
@ -906,11 +907,9 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
ic.finishComposingText(); ic.finishComposingText();
} }
mVoiceProxy.setVoiceInputHighlighted(false); mVoiceProxy.setVoiceInputHighlighted(false);
} else if (!mHasUncommittedTypedChars && !mExpectingUpdateSelection } else if (!mHasUncommittedTypedChars && TextEntryState.isAcceptedDefault()) {
&& TextEntryState.isAcceptedDefault()) {
TextEntryState.reset(); TextEntryState.reset();
} }
if (!mExpectingUpdateSelection) {
mJustAddedMagicSpace = false; // The user moved the cursor. mJustAddedMagicSpace = false; // The user moved the cursor.
mJustReplacedDoubleSpace = false; mJustReplacedDoubleSpace = false;
} }