| commit | b6a19229ba6c996c18232a66c33293d343601fcf | [log] [tgz] |
|---|---|---|
| author | Keisuke Kuroyanagi <ksk@google.com> | Mon Dec 16 07:56:57 2013 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Dec 16 07:56:58 2013 +0000 |
| tree | 67e860da0f0b4f5924fb6ae92d0f19807e9e8d5e | |
| parent | 5590e9d04048483fbd397c36f0cc65cfdd10bb24 [diff] | |
| parent | c8377678190211a4f8cbf83ea4cc164474ce53d7 [diff] |
Merge "Make required binary dictionary version use FormatSpec.*"
diff --git a/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java b/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java index 7afd657..f785835 100644 --- a/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java +++ b/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java
@@ -140,7 +140,7 @@ // only, which right now use format 2 (dicts using format 4 use Decaying*, which overrides // this method). // TODO: Migrate these dicts to ver4 format, and remove this function. - return formatVersion == 2; + return formatVersion == FormatSpec.VERSION2; } public boolean isValidDictionary() {
diff --git a/java/src/com/android/inputmethod/latin/personalization/DecayingExpandableBinaryDictionaryBase.java b/java/src/com/android/inputmethod/latin/personalization/DecayingExpandableBinaryDictionaryBase.java index 9b573b4..3a5c115 100644 --- a/java/src/com/android/inputmethod/latin/personalization/DecayingExpandableBinaryDictionaryBase.java +++ b/java/src/com/android/inputmethod/latin/personalization/DecayingExpandableBinaryDictionaryBase.java
@@ -53,7 +53,7 @@ public static final int FREQUENCY_FOR_WORDS_IN_DICTS = FREQUENCY_FOR_TYPED; public static final int FREQUENCY_FOR_WORDS_NOT_IN_DICTS = Dictionary.NOT_A_PROBABILITY; - public static final int REQUIRED_BINARY_DICTIONARY_VERSION = 4; + public static final int REQUIRED_BINARY_DICTIONARY_VERSION = FormatSpec.VERSION4; /** Locale for which this user history dictionary is storing words */ private final Locale mLocale;