am c44314b4: am dc38a343: Merge "Use a freq of 1 instead of 0 for non-word shortcuts." into jb-mr1-dev

* commit 'c44314b40464366814179c5a5952a66ef65d9831':
  Use a freq of 1 instead of 0 for non-word shortcuts.
This commit is contained in:
Ken Wakasa 2012-10-09 07:46:40 -07:00 committed by Android Git Automerger
commit 0081681e34
2 changed files with 2 additions and 2 deletions

View file

@ -350,7 +350,7 @@ final class BinaryDictionaryGetter {
// of the dictionary would lose whitelist functionality. // of the dictionary would lose whitelist functionality.
private static boolean hackCanUseDictionaryFile(final Locale locale, final File f) { private static boolean hackCanUseDictionaryFile(final Locale locale, final File f) {
// Only for English - other languages didn't have a whitelist, hence this // Only for English - other languages didn't have a whitelist, hence this
// ad-hock ## HACK ## // ad-hoc ## HACK ##
if (!Locale.ENGLISH.getLanguage().equals(locale.getLanguage())) return true; if (!Locale.ENGLISH.getLanguage().equals(locale.getLanguage())) return true;
FileInputStream inStream = null; FileInputStream inStream = null;

View file

@ -93,7 +93,7 @@ public class XmlDictInputOutput {
final FusionDictionary dict = mDictionary; final FusionDictionary dict = mDictionary;
for (final String shortcutOnly : mShortcutsMap.keySet()) { for (final String shortcutOnly : mShortcutsMap.keySet()) {
if (dict.hasWord(shortcutOnly)) continue; if (dict.hasWord(shortcutOnly)) continue;
dict.add(shortcutOnly, 0, mShortcutsMap.get(shortcutOnly), true /* isNotAWord */); dict.add(shortcutOnly, 1, mShortcutsMap.get(shortcutOnly), true /* isNotAWord */);
} }
mDictionary = null; mDictionary = null;
mShortcutsMap.clear(); mShortcutsMap.clear();