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

Should update suggestion strip even if suggetion count is 1, in case typed word's length is 1 

bug: 3320818
Change-Id: I98ac8e0649de5dfd8b886401d42f2e5bcc2a8a1a
main
Ken Wakasa 2011-01-10 11:59:46 +09:00
parent 2faf0a176c
commit a776b7fc4a
1 changed files with 11 additions and 6 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

@ -776,11 +776,11 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
@Override @Override
public void onDisplayCompletions(CompletionInfo[] applicationSpecifiedCompletions) { public void onDisplayCompletions(CompletionInfo[] applicationSpecifiedCompletions) {
if (DEBUG) { if (DEBUG) {
Log.i("foo", "Received completions:"); Log.i(TAG, "Received completions:");
final int count = (applicationSpecifiedCompletions != null) final int count = (applicationSpecifiedCompletions != null)
? applicationSpecifiedCompletions.length : 0; ? applicationSpecifiedCompletions.length : 0;
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
Log.i("foo", " #" + i + ": " + applicationSpecifiedCompletions[i]); Log.i(TAG, " #" + i + ": " + applicationSpecifiedCompletions[i]);
} }
} }
if (mApplicationSpecifiedCompletionOn) { if (mApplicationSpecifiedCompletionOn) {
@ -1447,7 +1447,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
} }
private void showSuggestions(WordComposer word) { private void showSuggestions(WordComposer word) {
// long startTime = System.currentTimeMillis(); // TIME MEASUREMENT!
// TODO Maybe need better way of retrieving previous word // TODO Maybe need better way of retrieving previous word
CharSequence prevWord = EditingUtils.getPreviousWord(getCurrentInputConnection(), CharSequence prevWord = EditingUtils.getPreviousWord(getCurrentInputConnection(),
mWordSeparators); mWordSeparators);
@ -1459,9 +1458,9 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
boolean correctionAvailable = !mInputTypeNoAutoCorrect && !mJustReverted boolean correctionAvailable = !mInputTypeNoAutoCorrect && !mJustReverted
&& mSuggest.hasMinimalCorrection(); && mSuggest.hasMinimalCorrection();
CharSequence typedWord = word.getTypedWord(); final CharSequence typedWord = word.getTypedWord();
// If we're in basic correct // If we're in basic correct
boolean typedWordValid = mSuggest.isValidWord(typedWord) || final boolean typedWordValid = mSuggest.isValidWord(typedWord) ||
(preferCapitalization() (preferCapitalization()
&& mSuggest.isValidWord(typedWord.toString().toLowerCase())); && mSuggest.isValidWord(typedWord.toString().toLowerCase()));
if (mCorrectionMode == Suggest.CORRECTION_FULL if (mCorrectionMode == Suggest.CORRECTION_FULL
@ -1472,7 +1471,13 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
correctionAvailable &= !word.isMostlyCaps(); correctionAvailable &= !word.isMostlyCaps();
correctionAvailable &= !TextEntryState.isCorrecting(); correctionAvailable &= !TextEntryState.isCorrecting();
if (builder.size() > 1 || mCandidateView.isShowingAddToDictionaryHint()) { // Basically, we update the suggestion strip only when suggestion count > 1. However,
// there is an exception: We update the suggestion strip whenever typed word's length
// is 1, regardless of suggestion count. Actually, in most cases, suggestion count is 1
// when typed word's length is 1, but we do always need to clear the previous state when
// the user starts typing a word (i.e. typed word's length == 1).
if (typedWord.length() == 1 || builder.size() > 1
|| mCandidateView.isShowingAddToDictionaryHint()) {
builder.setTypedWordValid(typedWordValid).setHasMinimalSuggestion(correctionAvailable); builder.setTypedWordValid(typedWordValid).setHasMinimalSuggestion(correctionAvailable);
} else { } else {
final SuggestedWords previousSuggestions = mCandidateView.getSuggestions(); final SuggestedWords previousSuggestions = mCandidateView.getSuggestions();