aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/DictionaryFacilitator.java
diff options
context:
space:
mode:
authorDan Zivkovic <zivkovic@google.com>2015-04-10 01:52:23 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-10 01:52:23 +0000
commit694f6dbd5392d447d7ddc79d4deba646e6050c6d (patch)
tree75c87d133ed6199c8b97448c55f500fd94202c31 /java/src/com/android/inputmethod/latin/DictionaryFacilitator.java
parentefa968acd9123d30c023b625549c452d539dcc1d (diff)
parent40f0f61bb365b5073f1d9fdb56a393c5df5ef4b0 (diff)
downloadlatinime-694f6dbd5392d447d7ddc79d4deba646e6050c6d.tar.gz
latinime-694f6dbd5392d447d7ddc79d4deba646e6050c6d.tar.xz
latinime-694f6dbd5392d447d7ddc79d4deba646e6050c6d.zip
am 40f0f61b: Merge "Personal dictionary feeds a personal LM."
* commit '40f0f61bb365b5073f1d9fdb56a393c5df5ef4b0': Personal dictionary feeds a personal LM.
Diffstat (limited to 'java/src/com/android/inputmethod/latin/DictionaryFacilitator.java')
-rw-r--r--java/src/com/android/inputmethod/latin/DictionaryFacilitator.java25
1 files changed, 4 insertions, 21 deletions
diff --git a/java/src/com/android/inputmethod/latin/DictionaryFacilitator.java b/java/src/com/android/inputmethod/latin/DictionaryFacilitator.java
index d5dff10db..ff798abd6 100644
--- a/java/src/com/android/inputmethod/latin/DictionaryFacilitator.java
+++ b/java/src/com/android/inputmethod/latin/DictionaryFacilitator.java
@@ -45,31 +45,14 @@ public interface DictionaryFacilitator {
public static final String[] ALL_DICTIONARY_TYPES = new String[] {
Dictionary.TYPE_MAIN,
+ Dictionary.TYPE_CONTACTS,
Dictionary.TYPE_USER_HISTORY,
- Dictionary.TYPE_USER,
- Dictionary.TYPE_CONTACTS};
+ Dictionary.TYPE_USER};
public static final String[] DYNAMIC_DICTIONARY_TYPES = new String[] {
+ Dictionary.TYPE_CONTACTS,
Dictionary.TYPE_USER_HISTORY,
- Dictionary.TYPE_USER,
- Dictionary.TYPE_CONTACTS};
-
- /**
- * {@link Dictionary#TYPE_USER} is deprecated, except for the spelling service.
- */
- public static final String[] DICTIONARY_TYPES_FOR_SPELLING = new String[] {
- Dictionary.TYPE_MAIN,
- Dictionary.TYPE_USER_HISTORY,
- Dictionary.TYPE_USER,
- Dictionary.TYPE_CONTACTS};
-
- /**
- * {@link Dictionary#TYPE_USER} is deprecated, except for the spelling service.
- */
- public static final String[] DICTIONARY_TYPES_FOR_SUGGESTIONS = new String[] {
- Dictionary.TYPE_MAIN,
- Dictionary.TYPE_USER_HISTORY,
- Dictionary.TYPE_CONTACTS};
+ Dictionary.TYPE_USER};
/**
* Returns whether this facilitator is exactly for this locale.