2 files changed, 16 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java b/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java
index 4dbfa0bac..b1966bffc 100644
--- a/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java
+++ b/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java
@@ -122,6 +122,12 @@ 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.
      *
@@ -398,6 +404,10 @@ 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,
diff --git a/java/src/com/android/inputmethod/latin/personalization/ContextualDictionary.java b/java/src/com/android/inputmethod/latin/personalization/ContextualDictionary.java
index 96755a98f..81ac6cc5f 100644
--- a/java/src/com/android/inputmethod/latin/personalization/ContextualDictionary.java
+++ b/java/src/com/android/inputmethod/latin/personalization/ContextualDictionary.java
@@ -35,6 +35,7 @@ public class ContextualDictionary extends ExpandableBinaryDictionary {
         // Always reset the contents.
         clear();
     }
+
     @UsedForTesting
     public static ContextualDictionary getDictionary(final Context context, final Locale locale,
             final File dictFile, final String dictNamePrefix) {
@@ -42,6 +43,11 @@ public class ContextualDictionary extends ExpandableBinaryDictionary {
     }
 
     @Override
+    protected boolean enableBeginningOfSentencePrediction() {
+        return true;
+    }
+
+    @Override
     public boolean isValidWord(final String word) {
         // Strings out of this dictionary should not be considered existing words.
         return false;