aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorKeisuke Kuroyanagi <ksk@google.com>2014-08-08 08:57:45 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-08 08:57:45 +0000
commit0e74d71f254ad40d989e82d387fafe0fbc83969c (patch)
tree6b0c44e60fc0f22033d3ef6b63bab3c600c27bd3 /java
parentaaa2ce26203f3e85e7783ccd21275702ebfbe366 (diff)
parenta848c094857c8457a86e7a9159163df4b3af65d0 (diff)
downloadlatinime-0e74d71f254ad40d989e82d387fafe0fbc83969c.tar.gz
latinime-0e74d71f254ad40d989e82d387fafe0fbc83969c.tar.xz
latinime-0e74d71f254ad40d989e82d387fafe0fbc83969c.zip
am a848c094: Merge "Rename distracter filter class." into lmp-dev
* commit 'a848c094857c8457a86e7a9159163df4b3af65d0': Rename distracter filter class.
Diffstat (limited to 'java')
-rw-r--r--java/src/com/android/inputmethod/latin/LatinIME.java5
-rw-r--r--java/src/com/android/inputmethod/latin/utils/DistracterFilterCheckingExactMatchesAndSuggestions.java (renamed from java/src/com/android/inputmethod/latin/utils/DistracterFilterCheckingExactMatches.java)7
2 files changed, 7 insertions, 5 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 3a5f85d63..2e3cd6b6f 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -84,7 +84,7 @@ import com.android.inputmethod.latin.utils.ApplicationUtils;
import com.android.inputmethod.latin.utils.CapsModeUtils;
import com.android.inputmethod.latin.utils.CoordinateUtils;
import com.android.inputmethod.latin.utils.DialogUtils;
-import com.android.inputmethod.latin.utils.DistracterFilterCheckingExactMatches;
+import com.android.inputmethod.latin.utils.DistracterFilterCheckingExactMatchesAndSuggestions;
import com.android.inputmethod.latin.utils.ImportantNoticeUtils;
import com.android.inputmethod.latin.utils.IntentUtils;
import com.android.inputmethod.latin.utils.JniUtils;
@@ -126,7 +126,8 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
private final Settings mSettings;
private final DictionaryFacilitator mDictionaryFacilitator =
- new DictionaryFacilitator(new DistracterFilterCheckingExactMatches(this /* context */));
+ new DictionaryFacilitator(
+ new DistracterFilterCheckingExactMatchesAndSuggestions(this /* context */));
// TODO: Move from LatinIME.
private final PersonalizationDictionaryUpdater mPersonalizationDictionaryUpdater =
new PersonalizationDictionaryUpdater(this /* context */, mDictionaryFacilitator);
diff --git a/java/src/com/android/inputmethod/latin/utils/DistracterFilterCheckingExactMatches.java b/java/src/com/android/inputmethod/latin/utils/DistracterFilterCheckingExactMatchesAndSuggestions.java
index 845b73961..27973287d 100644
--- a/java/src/com/android/inputmethod/latin/utils/DistracterFilterCheckingExactMatches.java
+++ b/java/src/com/android/inputmethod/latin/utils/DistracterFilterCheckingExactMatchesAndSuggestions.java
@@ -43,8 +43,9 @@ import com.android.inputmethod.latin.settings.SettingsValuesForSuggestion;
* This class is used to prevent distracters being added to personalization
* or user history dictionaries
*/
-public class DistracterFilterCheckingExactMatches implements DistracterFilter {
- private static final String TAG = DistracterFilterCheckingExactMatches.class.getSimpleName();
+public class DistracterFilterCheckingExactMatchesAndSuggestions implements DistracterFilter {
+ private static final String TAG =
+ DistracterFilterCheckingExactMatchesAndSuggestions.class.getSimpleName();
private static final boolean DEBUG = false;
private static final long TIMEOUT_TO_WAIT_LOADING_DICTIONARIES_IN_SECONDS = 120;
@@ -70,7 +71,7 @@ public class DistracterFilterCheckingExactMatches implements DistracterFilter {
*
* @param context the context.
*/
- public DistracterFilterCheckingExactMatches(final Context context) {
+ public DistracterFilterCheckingExactMatchesAndSuggestions(final Context context) {
mContext = context;
mLocaleToSubtypeMap = new HashMap<>();
mLocaleToKeyboardMap = new HashMap<>();