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

Merge remote-tracking branch 'goog/master' into merge

main
satok 2011-04-27 20:45:24 +09:00
parent 31da2ea24b 3bf6fbb6b8
commit 8f060766f0
2 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
View File

@ -698,11 +698,15 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
if (!isSpaceCharacter(code) && code >= 0) { if (!isSpaceCharacter(code) && code >= 0) {
mSwitchState = SWITCH_STATE_SYMBOL; mSwitchState = SWITCH_STATE_SYMBOL;
} }
// Snap back to alpha keyboard mode immediately if user types a quote character.
if (isQuoteCharacter(code)) {
changeKeyboardMode();
}
break; break;
case SWITCH_STATE_SYMBOL: case SWITCH_STATE_SYMBOL:
case SWITCH_STATE_CHORDING_SYMBOL: case SWITCH_STATE_CHORDING_SYMBOL:
// Snap back to alpha keyboard mode if user types one or more non-space/enter // Snap back to alpha keyboard mode if user types one or more non-space/enter
// characters followed by a space/enter or quotation mark. // characters followed by a space/enter or a quote character.
if (isSpaceCharacter(code) || isQuoteCharacter(code)) { if (isSpaceCharacter(code) || isQuoteCharacter(code)) {
changeKeyboardMode(); changeKeyboardMode();
} }

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

@ -172,7 +172,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
private final StringBuilder mComposing = new StringBuilder(); private final StringBuilder mComposing = new StringBuilder();
private WordComposer mWord = new WordComposer(); private WordComposer mWord = new WordComposer();
private CharSequence mBestWord; private CharSequence mBestWord;
private boolean mHasValidSuggestions; private boolean mHasUncommittedTypedChars;
private boolean mHasDictionary; private boolean mHasDictionary;
private boolean mJustAddedAutoSpace; private boolean mJustAddedAutoSpace;
private boolean mAutoCorrectEnabled; private boolean mAutoCorrectEnabled;
@ -591,7 +591,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
inputView.closing(); inputView.closing();
mEnteredText = null; mEnteredText = null;
mComposing.setLength(0); mComposing.setLength(0);
mHasValidSuggestions = false; mHasUncommittedTypedChars = false;
mDeleteCount = 0; mDeleteCount = 0;
mJustAddedAutoSpace = false; mJustAddedAutoSpace = false;
@ -762,7 +762,7 @@ 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 (((mComposing.length() > 0 && mHasValidSuggestions) if (((mComposing.length() > 0 && mHasUncommittedTypedChars)
|| mVoiceProxy.isVoiceInputHighlighted()) || mVoiceProxy.isVoiceInputHighlighted())
&& (selectionChanged || candidatesCleared)) { && (selectionChanged || candidatesCleared)) {
if (candidatesCleared) { if (candidatesCleared) {
@ -772,7 +772,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
saveWordInHistory(mComposing); saveWordInHistory(mComposing);
} }
mComposing.setLength(0); mComposing.setLength(0);
mHasValidSuggestions = false; mHasUncommittedTypedChars = false;
if (isCursorTouchingWord()) { if (isCursorTouchingWord()) {
mHandler.cancelUpdateBigramPredictions(); mHandler.cancelUpdateBigramPredictions();
mHandler.postUpdateSuggestions(); mHandler.postUpdateSuggestions();
@ -785,7 +785,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
ic.finishComposingText(); ic.finishComposingText();
} }
mVoiceProxy.setVoiceInputHighlighted(false); mVoiceProxy.setVoiceInputHighlighted(false);
} else if (!mHasValidSuggestions && !mJustAccepted) { } else if (!mHasUncommittedTypedChars && !mJustAccepted) {
if (TextEntryState.isAcceptedDefault() || TextEntryState.isSpaceAfterPicked()) { if (TextEntryState.isAcceptedDefault() || TextEntryState.isSpaceAfterPicked()) {
if (TextEntryState.isAcceptedDefault()) if (TextEntryState.isAcceptedDefault())
TextEntryState.reset(); TextEntryState.reset();
@ -806,7 +806,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
if (isSuggestionsRequested() if (isSuggestionsRequested()
&& (candidatesStart == candidatesEnd || newSelStart != oldSelStart && (candidatesStart == candidatesEnd || newSelStart != oldSelStart
|| TextEntryState.isRecorrecting()) || TextEntryState.isRecorrecting())
&& (newSelStart < newSelEnd - 1 || !mHasValidSuggestions)) { && (newSelStart < newSelEnd - 1 || !mHasUncommittedTypedChars)) {
if (isCursorTouchingWord() || mLastSelectionStart < mLastSelectionEnd) { if (isCursorTouchingWord() || mLastSelectionStart < mLastSelectionEnd) {
mHandler.cancelUpdateBigramPredictions(); mHandler.cancelUpdateBigramPredictions();
mHandler.postUpdateOldSuggestions(); mHandler.postUpdateOldSuggestions();
@ -1007,8 +1007,8 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
} }
public void commitTyped(InputConnection inputConnection) { public void commitTyped(InputConnection inputConnection) {
if (mHasValidSuggestions) { if (mHasUncommittedTypedChars) {
mHasValidSuggestions = false; mHasUncommittedTypedChars = false;
if (mComposing.length() > 0) { if (mComposing.length() > 0) {
if (inputConnection != null) { if (inputConnection != null) {
inputConnection.commitText(mComposing, 1); inputConnection.commitText(mComposing, 1);
@ -1252,14 +1252,14 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
mVoiceProxy.handleBackspace(); mVoiceProxy.handleBackspace();
boolean deleteChar = false; boolean deleteChar = false;
if (mHasValidSuggestions) { if (mHasUncommittedTypedChars) {
final int length = mComposing.length(); final int length = mComposing.length();
if (length > 0) { if (length > 0) {
mComposing.delete(length - 1, length); mComposing.delete(length - 1, length);
mWord.deleteLast(); mWord.deleteLast();
ic.setComposingText(mComposing, 1); ic.setComposingText(mComposing, 1);
if (mComposing.length() == 0) { if (mComposing.length() == 0) {
mHasValidSuggestions = false; mHasUncommittedTypedChars = false;
} }
if (1 == length) { if (1 == length) {
// 1 == length means we are about to erase the last character of the word, // 1 == length means we are about to erase the last character of the word,
@ -1348,8 +1348,8 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
int code = primaryCode; int code = primaryCode;
if (isAlphabet(code) && isSuggestionsRequested() && !isCursorTouchingWord()) { if (isAlphabet(code) && isSuggestionsRequested() && !isCursorTouchingWord()) {
if (!mHasValidSuggestions) { if (!mHasUncommittedTypedChars) {
mHasValidSuggestions = true; mHasUncommittedTypedChars = true;
mComposing.setLength(0); mComposing.setLength(0);
saveWordInHistory(mBestWord); saveWordInHistory(mBestWord);
mWord.reset(); mWord.reset();
@ -1375,7 +1375,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
} }
} }
} }
if (mHasValidSuggestions) { if (mHasUncommittedTypedChars) {
if (mComposing.length() == 0 && switcher.isAlphabetMode() if (mComposing.length() == 0 && switcher.isAlphabetMode()
&& switcher.isShiftedOrShiftLocked()) { && switcher.isShiftedOrShiftLocked()) {
mWord.setFirstCharCapitalized(true); mWord.setFirstCharCapitalized(true);
@ -1415,7 +1415,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
ic.beginBatchEdit(); ic.beginBatchEdit();
abortRecorrection(false); abortRecorrection(false);
} }
if (mHasValidSuggestions) { if (mHasUncommittedTypedChars) {
// In certain languages where single quote is a separator, it's better // In certain languages where single quote is a separator, it's better
// 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
@ -1572,7 +1572,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
return; return;
} }
if (!mHasValidSuggestions) { if (!mHasUncommittedTypedChars) {
setPunctuationSuggestions(); setPunctuationSuggestions();
return; return;
} }
@ -1703,7 +1703,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
} }
return; return;
} }
if (!mHasValidSuggestions) { if (!mHasUncommittedTypedChars) {
// If we are not composing a word, then it was a suggestion inferred from // If we are not composing a word, then it was a suggestion inferred from
// context - no user input. We should reset the word composer. // context - no user input. We should reset the word composer.
mWord.reset(); mWord.reset();
@ -1777,7 +1777,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
ic.commitText(suggestion, 1); ic.commitText(suggestion, 1);
} }
saveWordInHistory(suggestion); saveWordInHistory(suggestion);
mHasValidSuggestions = false; mHasUncommittedTypedChars = false;
mCommittedLength = suggestion.length(); mCommittedLength = suggestion.length();
} }
@ -1835,7 +1835,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
} }
InputConnection ic = getCurrentInputConnection(); InputConnection ic = getCurrentInputConnection();
if (ic == null) return; if (ic == null) return;
if (!mHasValidSuggestions) { if (!mHasUncommittedTypedChars) {
// Extract the selected or touching text // Extract the selected or touching text
EditingUtils.SelectedWord touching = EditingUtils.getWordAtCursorOrSelection(ic, EditingUtils.SelectedWord touching = EditingUtils.getWordAtCursorOrSelection(ic,
mLastSelectionStart, mLastSelectionEnd, mWordSeparators); mLastSelectionStart, mLastSelectionEnd, mWordSeparators);
@ -1958,7 +1958,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
public void revertLastWord(boolean deleteChar) { public void revertLastWord(boolean deleteChar) {
final int length = mComposing.length(); final int length = mComposing.length();
if (!mHasValidSuggestions && length > 0) { if (!mHasUncommittedTypedChars && length > 0) {
final InputConnection ic = getCurrentInputConnection(); final InputConnection ic = getCurrentInputConnection();
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);
@ -1981,7 +1981,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
// Clear composing text // Clear composing text
mComposing.setLength(0); mComposing.setLength(0);
} else { } else {
mHasValidSuggestions = true; mHasUncommittedTypedChars = true;
ic.setComposingText(mComposing, 1); ic.setComposingText(mComposing, 1);
TextEntryState.backspace(); TextEntryState.backspace();
} }
@ -2400,7 +2400,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
p.println(" mComposing=" + mComposing.toString()); p.println(" mComposing=" + mComposing.toString());
p.println(" mIsSuggestionsRequested=" + mIsSettingsSuggestionStripOn); p.println(" mIsSuggestionsRequested=" + mIsSettingsSuggestionStripOn);
p.println(" mCorrectionMode=" + mCorrectionMode); p.println(" mCorrectionMode=" + mCorrectionMode);
p.println(" mHasValidSuggestions=" + mHasValidSuggestions); p.println(" mHasUncommittedTypedChars=" + mHasUncommittedTypedChars);
p.println(" mAutoCorrectOn=" + mAutoCorrectOn); p.println(" mAutoCorrectOn=" + mAutoCorrectOn);
p.println(" mAutoSpace=" + mAutoSpace); p.println(" mAutoSpace=" + mAutoSpace);
p.println(" mApplicationSpecifiedCompletionOn=" + mApplicationSpecifiedCompletionOn); p.println(" mApplicationSpecifiedCompletionOn=" + mApplicationSpecifiedCompletionOn);