am dc6ee3a6: Merge "Enable beginning-of-sentence prediction."

* commit 'dc6ee3a63fdabe88f5528e81adabad93cfc4ecb3':
  Enable beginning-of-sentence prediction.
main
Keisuke Kuroyanagi 2014-06-24 09:05:01 +00:00 committed by Android Git Automerger
commit 68c90f30ae
2 changed files with 0 additions and 15 deletions

View File

@ -122,12 +122,6 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
return mBinaryDictionary.isValidDictionary();
}
// TODO: Remove and always enable beginning of sentence prediction. Currently, this is enabled
// only for ContextualDictionary.
protected boolean enableBeginningOfSentencePrediction() {
return false;
}
/**
* Creates a new expandable binary dictionary.
*
@ -426,10 +420,6 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
if (mBinaryDictionary == null) {
return null;
}
if (composer.size() == 0 && prevWordsInfo.mIsBeginningOfSentence
&& !enableBeginningOfSentencePrediction()) {
return null;
}
final ArrayList<SuggestedWordInfo> suggestions =
mBinaryDictionary.getSuggestions(composer, prevWordsInfo, proximityInfo,
blockOffensiveWords, additionalFeaturesOptions, sessionId,

View File

@ -42,11 +42,6 @@ public class ContextualDictionary extends ExpandableBinaryDictionary {
return new ContextualDictionary(context, locale, dictFile);
}
@Override
protected boolean enableBeginningOfSentencePrediction() {
return true;
}
@Override
public boolean isValidWord(final String word) {
// Strings out of this dictionary should not be considered existing words.