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

[IL84] Remove a useless call and rename a method 

Bug: 8636060
Change-Id: I5cac787953a3c71b6402520c2f5c70619d4a40a8
main
Jean Chalard 2014-01-24 18:36:18 +09:00
parent eb190ab32f
commit b2c0388a69
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -789,7 +789,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
if (mSuggestionStripView != null) { if (mSuggestionStripView != null) {
// This will set the punctuation suggestions if next word suggestion is off; // This will set the punctuation suggestions if next word suggestion is off;
// otherwise it will clear the suggestion strip. // otherwise it will clear the suggestion strip.
setPunctuationSuggestions(); setNeutralSuggestionStrip();
} }
// Sometimes, while rotating, for some reason the framework tells the app we are not // Sometimes, while rotating, for some reason the framework tells the app we are not
@ -1561,11 +1561,12 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
} }
// TODO[IL]: Define a clean interface for this // TODO[IL]: Define a clean interface for this
public void setPunctuationSuggestions() { // This will show either an empty suggestion strip (if prediction is enabled) or
// punctuation suggestions (if it's disabled).
public void setNeutralSuggestionStrip() {
final SettingsValues currentSettings = mSettings.getCurrent(); final SettingsValues currentSettings = mSettings.getCurrent();
if (currentSettings.mBigramPredictionEnabled) { if (currentSettings.mBigramPredictionEnabled) {
setSuggestedWords(SuggestedWords.EMPTY); setSuggestedWords(SuggestedWords.EMPTY);
setAutoCorrectionIndicator(false);
} else { } else {
setSuggestedWords(currentSettings.mSpacingAndPunctuations.mSuggestPuncList); setSuggestedWords(currentSettings.mSpacingAndPunctuations.mSuggestPuncList);
} }

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

@ -706,7 +706,7 @@ public final class InputLogic {
// Set punctuation right away. onUpdateSelection will fire but tests whether it is // Set punctuation right away. onUpdateSelection will fire but tests whether it is
// already displayed or not, so it's okay. // already displayed or not, so it's okay.
mLatinIME.setPunctuationSuggestions(); mLatinIME.setNeutralSuggestionStrip();
} }
keyboardSwitcher.updateShiftState(); keyboardSwitcher.updateShiftState();
@ -1059,7 +1059,7 @@ public final class InputLogic {
} }
if (!mWordComposer.isComposingWord() && !settingsValues.mBigramPredictionEnabled) { if (!mWordComposer.isComposingWord() && !settingsValues.mBigramPredictionEnabled) {
mLatinIME.setPunctuationSuggestions(); mLatinIME.setNeutralSuggestionStrip();
return; return;
} }