From 976d0ce7f1d658bffbb14bb83005cd5545d9fd81 Mon Sep 17 00:00:00 2001 From: Jean Chalard Date: Wed, 4 Jun 2014 18:13:32 +0900 Subject: [PATCH] Allow multiple shortcuts for a personal dictionary word Bug: 13869301 Change-Id: I040613bdddc9f18875e29f3382418476262b00ce --- .../settings/inputmethod/UserDictionaryAddWordContents.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/inputmethod/UserDictionaryAddWordContents.java b/src/com/android/settings/inputmethod/UserDictionaryAddWordContents.java index d81703ea1c9..638818a75c6 100644 --- a/src/com/android/settings/inputmethod/UserDictionaryAddWordContents.java +++ b/src/com/android/settings/inputmethod/UserDictionaryAddWordContents.java @@ -146,7 +146,9 @@ public class UserDictionaryAddWordContents { // 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 // exists with at least one shortcut, in which case it has priority on our word. - if (hasWord(newWord, context)) return UserDictionaryAddWordActivity.CODE_ALREADY_PRESENT; + if (TextUtils.isEmpty(newShortcut) && hasWord(newWord, context)) { + return UserDictionaryAddWordActivity.CODE_ALREADY_PRESENT; + } // 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