diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2012-10-09 07:45:03 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-10-09 07:45:03 -0700 |
| commit | c44314b40464366814179c5a5952a66ef65d9831 (patch) | |
| tree | c6bda738b98e24dce0280ce93f278f686feb3fbe | |
| parent | f5c10d00a9ae03a792af42f237ee07c6f033dc7a (diff) | |
| parent | dc38a3438bca6b46c31b6ac2cbbf8cb0466b5a83 (diff) | |
| download | latinime-c44314b40464366814179c5a5952a66ef65d9831.tar.gz latinime-c44314b40464366814179c5a5952a66ef65d9831.tar.xz latinime-c44314b40464366814179c5a5952a66ef65d9831.zip | |
am dc38a343: Merge "Use a freq of 1 instead of 0 for non-word shortcuts." into jb-mr1-dev
* commit 'dc38a3438bca6b46c31b6ac2cbbf8cb0466b5a83':
Use a freq of 1 instead of 0 for non-word shortcuts.
| -rw-r--r-- | java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java | 2 | ||||
| -rw-r--r-- | tools/dicttool/src/android/inputmethod/latin/dicttool/XmlDictInputOutput.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java b/java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java index fa9f79ecd..201a10187 100644 --- a/java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java +++ b/java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java @@ -350,7 +350,7 @@ final class BinaryDictionaryGetter { // of the dictionary would lose whitelist functionality. private static boolean hackCanUseDictionaryFile(final Locale locale, final File f) { // 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; FileInputStream inStream = null; diff --git a/tools/dicttool/src/android/inputmethod/latin/dicttool/XmlDictInputOutput.java b/tools/dicttool/src/android/inputmethod/latin/dicttool/XmlDictInputOutput.java index c31cd724a..252c3d655 100644 --- a/tools/dicttool/src/android/inputmethod/latin/dicttool/XmlDictInputOutput.java +++ b/tools/dicttool/src/android/inputmethod/latin/dicttool/XmlDictInputOutput.java @@ -93,7 +93,7 @@ public class XmlDictInputOutput { final FusionDictionary dict = mDictionary; for (final String shortcutOnly : mShortcutsMap.keySet()) { 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; mShortcutsMap.clear(); |