aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2012-08-10 01:17:00 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-10 01:17:00 -0700
commitb2bcac76e9a42ee3153169bf37a06a20df906f35 (patch)
treee792977f1a55d8048f2b301023a181e1a0cca8dc
parentf3d676ccc5334e2dc4856f66cebec93355cc5739 (diff)
parent36e2a3bd49cf87fe07c2ec04942adde33dbe69bf (diff)
downloadlatinime-b2bcac76e9a42ee3153169bf37a06a20df906f35.tar.gz
latinime-b2bcac76e9a42ee3153169bf37a06a20df906f35.tar.xz
latinime-b2bcac76e9a42ee3153169bf37a06a20df906f35.zip
am 36e2a3bd: am 28f73ef3: Merge "Reinstate putting shortcut-only entries in the dictionary" into jb-mr1-dev
* commit '36e2a3bd49cf87fe07c2ec04942adde33dbe69bf': Reinstate putting shortcut-only entries in the dictionary
-rw-r--r--tools/dicttool/src/android/inputmethod/latin/dicttool/XmlDictInputOutput.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/dicttool/src/android/inputmethod/latin/dicttool/XmlDictInputOutput.java b/tools/dicttool/src/android/inputmethod/latin/dicttool/XmlDictInputOutput.java
index 9ab56d797..9ce8c4934 100644
--- a/tools/dicttool/src/android/inputmethod/latin/dicttool/XmlDictInputOutput.java
+++ b/tools/dicttool/src/android/inputmethod/latin/dicttool/XmlDictInputOutput.java
@@ -90,6 +90,10 @@ public class XmlDictInputOutput {
public FusionDictionary getFinalDictionary() {
final FusionDictionary dict = mDictionary;
+ for (final String shortcutOnly : mShortcutsMap.keySet()) {
+ if (dict.hasWord(shortcutOnly)) continue;
+ dict.add(shortcutOnly, 0, mShortcutsMap.get(shortcutOnly));
+ }
mDictionary = null;
mShortcutsMap.clear();
mWord = "";