diff options
| author |   satok <satok@google.com> | 2011-05-11 12:18:21 +0900 |
|---|---|---|
| committer | satok <satok@google.com> | 2011-05-11 12:18:21 +0900 |
| commit | 55f38adab99937eef97626136f57520ebe9c04a9 (patch) | |
| tree | 8a2c070730fbcbde3bd73640730334250e36f2c3 /java/src/com/android/inputmethod/latin/ExpandableDictionary.java | |
| parent | 38c984cbcc3e1264ce00483e876093202268ad65 (diff) | |
| parent | 9fbfd5877305ed19a20663630b498b6b3fdae942 (diff) | |
| download | latinime-55f38adab99937eef97626136f57520ebe9c04a9.tar.gz latinime-55f38adab99937eef97626136f57520ebe9c04a9.tar.xz latinime-55f38adab99937eef97626136f57520ebe9c04a9.zip | |
Merge remote-tracking branch 'goog/master' into merge
Conflicts:
java/res/xml/method.xml
Change-Id: I04a476465593d25105545b98607425d2978ff872
Diffstat (limited to 'java/src/com/android/inputmethod/latin/ExpandableDictionary.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/ExpandableDictionary.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/latin/ExpandableDictionary.java b/java/src/com/android/inputmethod/latin/ExpandableDictionary.java index be2c6b21b..26391fe46 100644 --- a/java/src/com/android/inputmethod/latin/ExpandableDictionary.java +++ b/java/src/com/android/inputmethod/latin/ExpandableDictionary.java @@ -19,6 +19,8 @@ package com.android.inputmethod.latin; import android.content.Context; import android.os.AsyncTask; +import com.android.inputmethod.keyboard.Keyboard; + import java.util.LinkedList; /** @@ -41,8 +43,6 @@ public class ExpandableDictionary extends Dictionary { private int mMaxDepth; private int mInputLength; - private static final char QUOTE = '\''; - private boolean mRequiresReload; private boolean mUpdatingDictionary; @@ -304,7 +304,8 @@ public class ExpandableDictionary extends Dictionary { getWordsRec(children, codes, word, depth + 1, completion, snr, inputIndex, skipPos, callback); } - } else if ((c == QUOTE && currentChars[0] != QUOTE) || depth == skipPos) { + } else if ((c == Keyboard.CODE_SINGLE_QUOTE + && currentChars[0] != Keyboard.CODE_SINGLE_QUOTE) || depth == skipPos) { // Skip the ' and continue deeper word[depth] = c; if (children != null) { |