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

am 9909d6aa: Merge "[IL93] Refactor a method inside another" 

* commit '9909d6aa49ea17b6dd391a48e2ad29be11006249':
  [IL93] Refactor a method inside another
main
Jean Chalard 2014-01-27 19:34:07 -08:00 committed by Android Git Automerger
parent d5259d578b 9909d6aa49
commit 43502ea3ba
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1011,7 +1011,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
false /* isPrediction */); false /* isPrediction */);
// When in fullscreen mode, show completions generated by the application // When in fullscreen mode, show completions generated by the application
setSuggestedWords(suggestedWords); setSuggestedWords(suggestedWords);
setAutoCorrectionIndicator(false);
setSuggestionStripShown(true); setSuggestionStripShown(true);
if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) { if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) {
ResearchLogger.latinIME_onDisplayCompletions(applicationSpecifiedCompletions); ResearchLogger.latinIME_onDisplayCompletions(applicationSpecifiedCompletions);
@ -1336,6 +1335,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
mSuggestionStripView.setSuggestions(words); mSuggestionStripView.setSuggestions(words);
mKeyboardSwitcher.onAutoCorrectionStateChanged(words.mWillAutoCorrect); mKeyboardSwitcher.onAutoCorrectionStateChanged(words.mWillAutoCorrect);
} }
setAutoCorrectionIndicator(words.mWillAutoCorrect);
} }
private void setAutoCorrectionIndicator(final boolean newAutoCorrectionIndicator) { private void setAutoCorrectionIndicator(final boolean newAutoCorrectionIndicator) {
@ -1440,7 +1440,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
mInputLogic.mWordComposer.setAutoCorrection(autoCorrection); mInputLogic.mWordComposer.setAutoCorrection(autoCorrection);
} }
setSuggestedWords(suggestedWords); setSuggestedWords(suggestedWords);
setAutoCorrectionIndicator(suggestedWords.mWillAutoCorrect);
setSuggestionStripShown(isSuggestionsStripVisible()); setSuggestionStripShown(isSuggestionsStripVisible());
// Cache the auto-correction in accessibility code so we can speak it if the user // Cache the auto-correction in accessibility code so we can speak it if the user
// touches a key that will insert it. // touches a key that will insert it.
@ -1558,7 +1557,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
} else { } else {
setSuggestedWords(currentSettings.mSpacingAndPunctuations.mSuggestPuncList); setSuggestedWords(currentSettings.mSpacingAndPunctuations.mSuggestPuncList);
} }
setAutoCorrectionIndicator(false);
setSuggestionStripShown(isSuggestionsStripVisible()); setSuggestionStripShown(isSuggestionsStripVisible());
} }