commit 87343166e5e79dde4990f75a4d466e1ae6bcce94
author Keisuke Kuroyanagi <ksk@google.com> Mon May 12 19:48:58 2014 +0900
committer Keisuke Kuroyanagi <ksk@google.com> Mon May 12 19:48:58 2014 +0900
tree 088cc59c5286d34a4b5354d2ff27f2f6ac664795
parent ddacfdeb090949383f5e22b96500563d944abe40

Add freq=0 words to user history depending on the option.

Bug: 14686585
Change-Id: Ia1c3adb1bcc625788016e378e1ac7b0792ea9f4e

java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java

diff --git a/java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java b/java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java
index a834902..3697734 100644
--- a/java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java
+++ b/java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java
@@ -366,7 +366,8 @@
     }
 
     public void addToUserHistory(final String suggestion, final boolean wasAutoCapitalized,
-            final String previousWord, final int timeStampInSeconds) {
+            final String previousWord, final int timeStampInSeconds,
+            final boolean blockPotentiallyOffensive) {
         final Dictionaries dictionaries = mDictionaries;
         final String[] words = suggestion.split(Constants.WORD_SEPARATOR);
         for (int i = 0; i < words.length; i++) {
@@ -374,19 +375,20 @@
             final String prevWord = (i == 0) ? previousWord : words[i - 1];
             final boolean wasCurrentWordAutoCapitalized = (i == 0) ? wasAutoCapitalized : false;
             addWordToUserHistory(dictionaries, prevWord, currentWord,
-                    wasCurrentWordAutoCapitalized, timeStampInSeconds);
+                    wasCurrentWordAutoCapitalized, timeStampInSeconds, blockPotentiallyOffensive);
         }
     }
 
     private void addWordToUserHistory(final Dictionaries dictionaries, final String prevWord,
-            final String word, final boolean wasAutoCapitalized, final int timeStampInSeconds) {
+            final String word, final boolean wasAutoCapitalized, final int timeStampInSeconds,
+            final boolean blockPotentiallyOffensive) {
         final ExpandableBinaryDictionary userHistoryDictionary =
                 dictionaries.getSubDict(Dictionary.TYPE_USER_HISTORY);
         if (userHistoryDictionary == null) {
             return;
         }
         final int maxFreq = getMaxFrequency(word);
-        if (maxFreq == 0) {
+        if (maxFreq == 0 && blockPotentiallyOffensive) {
             return;
         }
         final String lowerCasedWord = word.toLowerCase(dictionaries.mLocale);

java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java

diff --git a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
index 127db8d..906259f 100644
--- a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
+++ b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
@@ -1225,7 +1225,7 @@
         final int timeStampInSeconds = (int)TimeUnit.MILLISECONDS.toSeconds(
                 System.currentTimeMillis());
         mSuggest.mDictionaryFacilitator.addToUserHistory(suggestion, wasAutoCapitalized, prevWord,
-                timeStampInSeconds);
+                timeStampInSeconds, settingsValues.mBlockPotentiallyOffensive);
     }
 
     public void performUpdateSuggestionStripSync(final SettingsValues settingsValues) {