nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 9d4d61f9: Merge "Allow multiple shortcuts for a personal dictionary word" 

* commit '9d4d61f9c1273cbe1761c5eccb18e6df9a7490bc':
  Allow multiple shortcuts for a personal dictionary word
main
Jean Chalard 2014-06-04 13:35:54 +00:00 committed by Android Git Automerger
parent 77fb4247f2 9d4d61f9c1
commit 43e28b475a
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
java/src/com/android/inputmethod/latin/userdictionary/UserDictionaryAddWordContents.java
View File

@ -167,7 +167,9 @@ public class UserDictionaryAddWordContents {
// should not insert, because either A. the word exists with no shortcut, in which // should not insert, because either A. the word exists with no shortcut, in which
// case the exact same thing we want to insert is already there, or B. the word // case the exact same thing we want to insert is already there, or B. the word
// exists with at least one shortcut, in which case it has priority on our word. // exists with at least one shortcut, in which case it has priority on our word.
if (hasWord(newWord, context)) return CODE_ALREADY_PRESENT; if (TextUtils.isEmpty(newShortcut) && hasWord(newWord, context)) {
return CODE_ALREADY_PRESENT;
}
// Disallow duplicates. If the same word with no shortcut is defined, remove it; if // Disallow duplicates. If the same word with no shortcut is defined, remove it; if
// the same word with the same shortcut is defined, remove it; but we don't mind if // the same word with the same shortcut is defined, remove it; but we don't mind if