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

am f441047f: [IL43] Small cleanup 

* commit 'f441047fadd6bc60b05274ca4a7195e4ff4b680d':
  [IL43] Small cleanup
main
Jean Chalard 2013-12-26 05:17:52 -08:00 committed by Android Git Automerger
parent 654fe9724d f441047fad
commit 06b7e9e8f5
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1054,9 +1054,8 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
false /* isObsoleteSuggestions */, false /* isObsoleteSuggestions */,
false /* isPrediction */); false /* isPrediction */);
// When in fullscreen mode, show completions generated by the application // When in fullscreen mode, show completions generated by the application
final boolean isAutoCorrection = false; setSuggestedWords(suggestedWords);
setSuggestedWords(suggestedWords, isAutoCorrection); setAutoCorrectionIndicator(false);
setAutoCorrectionIndicator(isAutoCorrection);
setSuggestionStripShown(true); setSuggestionStripShown(true);
if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) { if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) {
ResearchLogger.latinIME_onDisplayCompletions(applicationSpecifiedCompletions); ResearchLogger.latinIME_onDisplayCompletions(applicationSpecifiedCompletions);
@ -1499,16 +1498,16 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
// TODO[IL]: Define a clear interface for this // TODO[IL]: Define a clear interface for this
public void clearSuggestionStrip() { public void clearSuggestionStrip() {
setSuggestedWords(SuggestedWords.EMPTY, false); setSuggestedWords(SuggestedWords.EMPTY);
setAutoCorrectionIndicator(false); setAutoCorrectionIndicator(false);
} }
// TODO[IL]: Define a clear interface for this // TODO[IL]: Define a clear interface for this
public void setSuggestedWords(final SuggestedWords words, final boolean isAutoCorrection) { public void setSuggestedWords(final SuggestedWords words) {
mInputLogic.mSuggestedWords = words; mInputLogic.mSuggestedWords = words;
if (mSuggestionStripView != null) { if (mSuggestionStripView != null) {
mSuggestionStripView.setSuggestions(words); mSuggestionStripView.setSuggestions(words);
mKeyboardSwitcher.onAutoCorrectionStateChanged(isAutoCorrection); mKeyboardSwitcher.onAutoCorrectionStateChanged(words.mWillAutoCorrect);
} }
} }
@ -1621,7 +1620,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
autoCorrection = typedWord; autoCorrection = typedWord;
} }
mInputLogic.mWordComposer.setAutoCorrection(autoCorrection); mInputLogic.mWordComposer.setAutoCorrection(autoCorrection);
setSuggestedWords(suggestedWords, suggestedWords.mWillAutoCorrect); setSuggestedWords(suggestedWords);
setAutoCorrectionIndicator(suggestedWords.mWillAutoCorrect); setAutoCorrectionIndicator(suggestedWords.mWillAutoCorrect);
setSuggestionStripShown(isSuggestionsStripVisible()); setSuggestionStripShown(isSuggestionsStripVisible());
// An auto-correction is available, cache it in accessibility code so // An auto-correction is available, cache it in accessibility code so
@ -1740,7 +1739,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
if (currentSettings.mBigramPredictionEnabled) { if (currentSettings.mBigramPredictionEnabled) {
clearSuggestionStrip(); clearSuggestionStrip();
} else { } else {
setSuggestedWords(currentSettings.mSuggestPuncList, false); setSuggestedWords(currentSettings.mSuggestPuncList);
} }
setAutoCorrectionIndicator(false); setAutoCorrectionIndicator(false);
setSuggestionStripShown(isSuggestionsStripVisible()); setSuggestionStripShown(isSuggestionsStripVisible());

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

@ -1391,7 +1391,7 @@ public final class InputLogic {
if (settingsValues.mBigramPredictionEnabled) { if (settingsValues.mBigramPredictionEnabled) {
mLatinIME.clearSuggestionStrip(); mLatinIME.clearSuggestionStrip();
} else { } else {
mLatinIME.setSuggestedWords(settingsValues.mSuggestPuncList, false); mLatinIME.setSuggestedWords(settingsValues.mSuggestPuncList);
} }
mConnection.resetCachesUponCursorMoveAndReturnSuccess(newSelStart, newSelEnd, mConnection.resetCachesUponCursorMoveAndReturnSuccess(newSelStart, newSelEnd,
shouldFinishComposition); shouldFinishComposition);