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

Merge "Underlining for correction is causing problems with styled text. Disable for now."

main
Amith Yamasani 2010-07-16 15:56:00 -07:00 committed by Android (Google) Code Review
parent 30ce6f0530 8b96a9a238
commit 5428f92658
1 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,6 +82,7 @@ public class LatinIME extends InputMethodService
static final boolean TRACE = false; static final boolean TRACE = false;
static final boolean VOICE_INSTALLED = true; static final boolean VOICE_INSTALLED = true;
static final boolean ENABLE_VOICE_BUTTON = true; static final boolean ENABLE_VOICE_BUTTON = true;
private static final boolean MODIFY_TEXT_FOR_CORRECTION = false;
private static final String PREF_VIBRATE_ON = "vibrate_on"; private static final String PREF_VIBRATE_ON = "vibrate_on";
private static final String PREF_SOUND_ON = "sound_on"; private static final String PREF_SOUND_ON = "sound_on";
@ -1604,7 +1605,7 @@ public class LatinIME extends InputMethodService
if (mBestWord != null && mBestWord.length() > 0) { if (mBestWord != null && mBestWord.length() > 0) {
TextEntryState.acceptedDefault(mWord.getTypedWord(), mBestWord); TextEntryState.acceptedDefault(mWord.getTypedWord(), mBestWord);
mJustAccepted = true; mJustAccepted = true;
pickSuggestion(mBestWord); pickSuggestion(mBestWord, false);
// Add the word to the auto dictionary if it's not a known word // Add the word to the auto dictionary if it's not a known word
checkAddToDictionary(mBestWord, AutoDictionary.FREQUENCY_FOR_TYPED); checkAddToDictionary(mBestWord, AutoDictionary.FREQUENCY_FOR_TYPED);
} }
@ -1650,7 +1651,7 @@ public class LatinIME extends InputMethodService
return; return;
} }
mJustAccepted = true; mJustAccepted = true;
pickSuggestion(suggestion); pickSuggestion(suggestion, correcting);
// Add the word to the auto dictionary if it's not a known word // Add the word to the auto dictionary if it's not a known word
if (index == 0) { if (index == 0) {
checkAddToDictionary(suggestion, AutoDictionary.FREQUENCY_FOR_PICKED); checkAddToDictionary(suggestion, AutoDictionary.FREQUENCY_FOR_PICKED);
@ -1696,7 +1697,15 @@ public class LatinIME extends InputMethodService
// TODO: implement rememberReplacedWord for typed words // TODO: implement rememberReplacedWord for typed words
} }
private void pickSuggestion(CharSequence suggestion) { /**
* Commits the chosen word to the text field and saves it for later
* retrieval.
* @param suggestion the suggestion picked by the user to be committed to
* the text field
* @param correcting whether this is due to a correction of an existing
* word.
*/
private void pickSuggestion(CharSequence suggestion, boolean correcting) {
if (mCapsLock) { if (mCapsLock) {
suggestion = suggestion.toString().toUpperCase(); suggestion = suggestion.toString().toUpperCase();
} else if (preferCapitalization() } else if (preferCapitalization()
@ -1707,9 +1716,17 @@ public class LatinIME extends InputMethodService
InputConnection ic = getCurrentInputConnection(); InputConnection ic = getCurrentInputConnection();
if (ic != null) { if (ic != null) {
rememberReplacedWord(suggestion); rememberReplacedWord(suggestion);
if (!VoiceInput.DELETE_SYMBOL.equals(suggestion)) { // If text is in correction mode and we're not using composing
ic.commitText(suggestion, 1); // text to underline, then the word at the cursor position needs
// to be removed before committing the correction
if (correcting && !MODIFY_TEXT_FOR_CORRECTION) {
if (mLastSelectionStart < mLastSelectionEnd) {
ic.setSelection(mLastSelectionStart, mLastSelectionStart);
}
EditingUtil.deleteWordAtCursor(ic, getWordSeparators());
} }
ic.commitText(suggestion, 1);
} }
saveWordInHistory(suggestion); saveWordInHistory(suggestion);
mPredicting = false; mPredicting = false;
@ -1828,9 +1845,11 @@ public class LatinIME extends InputMethodService
private void underlineWord(CharSequence word, int left, int right) { private void underlineWord(CharSequence word, int left, int right) {
InputConnection ic = getCurrentInputConnection(); InputConnection ic = getCurrentInputConnection();
if (ic == null) return; if (ic == null) return;
ic.finishComposingText(); if (MODIFY_TEXT_FOR_CORRECTION) {
ic.deleteSurroundingText(left, right); ic.finishComposingText();
ic.setComposingText(word, 1); ic.deleteSurroundingText(left, right);
ic.setComposingText(word, 1);
}
ic.setSelection(mLastSelectionStart, mLastSelectionStart); ic.setSelection(mLastSelectionStart, mLastSelectionStart);
} }