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

am 0c186c31: Merge "[IL106] Inline a now useless method." 

* commit '0c186c31d2dcb69a5d59afe0107878544a706c7b':
  [IL106] Inline a now useless method.
main
Jean Chalard 2014-01-29 19:50:21 -08:00 committed by Android Git Automerger
parent 28ff11cba2 0c186c31d2
commit 60e0aef937
2 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1519,18 +1519,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
} }
} }
public void unsetIsAutoCorrectionIndicatorOnAndCallShowSuggestionStrip(
final SuggestedWords suggestedWords) {
// Note that it's very important here that suggestedWords.mWillAutoCorrect is false.
// We never want to auto-correct on a resumed suggestion. Please refer to the three places
// above in restartSuggestionsOnWordTouchedByCursor() where suggestedWords is affected.
// We also need to unset mIsAutoCorrectionIndicatorOn to avoid showSuggestionStrip touching
// the text to adapt it.
// TODO: remove mIsAutoCorrectionIndicatorOn (see comment on definition)
mInputLogic.mIsAutoCorrectionIndicatorOn = false;
mHandler.showSuggestionStrip(suggestedWords);
}
// TODO: Make this private // TODO: Make this private
// Outside LatinIME, only used by the {@link InputTestsBase} test suite. // Outside LatinIME, only used by the {@link InputTestsBase} test suite.
@UsedForTesting @UsedForTesting

7
java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
View File

@ -1217,8 +1217,8 @@ public final class InputLogic {
// Since there is only one word, willAutoCorrect is false. // Since there is only one word, willAutoCorrect is false.
suggestedWords = suggestedWordsIncludingTypedWord; suggestedWords = suggestedWordsIncludingTypedWord;
} }
mLatinIME.unsetIsAutoCorrectionIndicatorOnAndCallShowSuggestionStrip( mIsAutoCorrectionIndicatorOn = false;
suggestedWords); mLatinIME.mHandler.showSuggestionStrip(suggestedWords);
}}); }});
} else { } else {
// We found suggestion spans in the word. We'll create the SuggestedWords out of // We found suggestion spans in the word. We'll create the SuggestedWords out of
@ -1227,7 +1227,8 @@ public final class InputLogic {
true /* typedWordValid */, false /* willAutoCorrect */, true /* typedWordValid */, false /* willAutoCorrect */,
false /* isPunctuationSuggestions */, false /* isObsoleteSuggestions */, false /* isPunctuationSuggestions */, false /* isObsoleteSuggestions */,
false /* isPrediction */, SuggestedWords.NOT_A_SEQUENCE_NUMBER); false /* isPrediction */, SuggestedWords.NOT_A_SEQUENCE_NUMBER);
mLatinIME.unsetIsAutoCorrectionIndicatorOnAndCallShowSuggestionStrip(suggestedWords); mIsAutoCorrectionIndicatorOn = false;
mLatinIME.mHandler.showSuggestionStrip(suggestedWords);
} }
} }