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

am c92dabb2: Merge "[IL112] Cleanup"

Browse source 
* commit 'c92dabb27e3e656d6a539ae60f929ee947099218':
  [IL112] Cleanup
This commit is contained in:
Jean Chalard 2014-03-03 21:47:40 -08:00 committed by Android Git Automerger
commit 58b18e8a17
1 changed files with 1 additions and 6 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

@ -875,7 +875,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
} }
// 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.
setNeutralSuggestionStripInternal(); setNeutralSuggestionStrip();
mHandler.cancelUpdateSuggestionStrip(); mHandler.cancelUpdateSuggestionStrip();
mHandler.cancelDoubleSpacePeriodTimer(); mHandler.cancelDoubleSpacePeriodTimer();
@ -1509,15 +1509,10 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
mSuggestionStripView.showAddToDictionaryHint(word); mSuggestionStripView.showAddToDictionaryHint(word);
} }
// TODO[IL]: Define a clean interface for this
// This will show either an empty suggestion strip (if prediction is enabled) or // This will show either an empty suggestion strip (if prediction is enabled) or
// punctuation suggestions (if it's disabled). // punctuation suggestions (if it's disabled).
@Override @Override
public void setNeutralSuggestionStrip() { public void setNeutralSuggestionStrip() {
setNeutralSuggestionStripInternal();
}
private void setNeutralSuggestionStripInternal() {
final SettingsValues currentSettings = mSettings.getCurrent(); final SettingsValues currentSettings = mSettings.getCurrent();
final SuggestedWords neutralSuggestions = currentSettings.mBigramPredictionEnabled final SuggestedWords neutralSuggestions = currentSettings.mBigramPredictionEnabled
? SuggestedWords.EMPTY : currentSettings.mSpacingAndPunctuations.mSuggestPuncList; ? SuggestedWords.EMPTY : currentSettings.mSpacingAndPunctuations.mSuggestPuncList;