diff options
| author | Sascha Prueter <saschap@google.com> | 2012-12-17 10:47:56 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-12-17 10:47:56 -0800 |
| commit | 8149820c2b2df47028498571785ca009d99b5dc9 (patch) | |
| tree | aa3f3ea9c8fd3d6af533d0901afa4e96f6586e9b /core/java/android/widget | |
| parent | 1d349dd4ee6e65e005498806f28e721d6961b03a (diff) | |
| parent | 25458528f07ef9f4710e669b74b76d687bbc7645 (diff) | |
| download | frameworks_base-8149820c2b2df47028498571785ca009d99b5dc9.zip frameworks_base-8149820c2b2df47028498571785ca009d99b5dc9.tar.gz frameworks_base-8149820c2b2df47028498571785ca009d99b5dc9.tar.bz2 | |
am 25458528: am dd2ed93e: Merge "Handle "CODE_ALREADY_PRESENT" message from Settings app" into jb-mr1.1-dev
* commit '25458528f07ef9f4710e669b74b76d687bbc7645':
Handle "CODE_ALREADY_PRESENT" message from Settings app
Diffstat (limited to 'core/java/android/widget')
| -rw-r--r-- | core/java/android/widget/Editor.java | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java index 84cde52..30d022c 100644 --- a/core/java/android/widget/Editor.java +++ b/core/java/android/widget/Editor.java @@ -3849,16 +3849,20 @@ public class Editor { @Override public void handleMessage(Message msg) { - final int code = msg.what; - if (code == 0) { /* CODE_WORD_ADDED */ - if (!(msg.obj instanceof Bundle)) { - Log.w(TAG, "Illegal message. Abort handling onUserDictionaryAdded."); + switch(msg.what) { + case 0: /* CODE_WORD_ADDED */ + case 2: /* CODE_ALREADY_PRESENT */ + if (!(msg.obj instanceof Bundle)) { + Log.w(TAG, "Illegal message. Abort handling onUserDictionaryAdded."); + return; + } + final Bundle bundle = (Bundle)msg.obj; + final String originalWord = bundle.getString("originalWord"); + final String addedWord = bundle.getString("word"); + onUserDictionaryAdded(originalWord, addedWord); + return; + default: return; - } - final Bundle bundle = (Bundle)msg.obj; - final String originalWord = bundle.getString("originalWord"); - final String addedWord = bundle.getString("word"); - onUserDictionaryAdded(originalWord, addedWord); } } |