am b6a19229: Merge "Make required binary dictionary version use FormatSpec.*"

* commit 'b6a19229ba6c996c18232a66c33293d343601fcf':
  Make required binary dictionary version use FormatSpec.*
main
Keisuke Kuroyanagi 2013-12-15 23:59:27 -08:00 committed by Android Git Automerger
commit f1f787e80e
2 changed files with 2 additions and 2 deletions

View File

@ -140,7 +140,7 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
// 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() {

View File

@ -53,7 +53,7 @@ public abstract class DecayingExpandableBinaryDictionaryBase extends ExpandableB
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;