diff options
| author |   Jean Chalard <jchalard@google.com> | 2013-02-22 16:16:01 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-02-22 16:16:01 -0800 |
| commit | df32362794c225b335c413552401fa03113a07e6 (patch) | |
| tree | 46c7abfb2c260bd1518918b218440cbac87b3ccd /java/src/com/android/inputmethod/accessibility/KeyCodeDescriptionMapper.java | |
| parent | a3e561dcb65d5ce9aab486b1aacdf8e747398148 (diff) | |
| parent | 8f794c72db07786c866e357c7853c339882b45ef (diff) | |
| download | latinime-df32362794c225b335c413552401fa03113a07e6.tar.gz latinime-df32362794c225b335c413552401fa03113a07e6.tar.xz latinime-df32362794c225b335c413552401fa03113a07e6.zip | |
am 8f794c72: Merge "Fix how the Enter action is decided"
* commit '8f794c72db07786c866e357c7853c339882b45ef':
Fix how the Enter action is decided
Diffstat (limited to 'java/src/com/android/inputmethod/accessibility/KeyCodeDescriptionMapper.java')
| -rw-r--r-- | java/src/com/android/inputmethod/accessibility/KeyCodeDescriptionMapper.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/accessibility/KeyCodeDescriptionMapper.java b/java/src/com/android/inputmethod/accessibility/KeyCodeDescriptionMapper.java index ea86d98cb..05d8269b7 100644 --- a/java/src/com/android/inputmethod/accessibility/KeyCodeDescriptionMapper.java +++ b/java/src/com/android/inputmethod/accessibility/KeyCodeDescriptionMapper.java @@ -110,7 +110,9 @@ public final class KeyCodeDescriptionMapper { return getDescriptionForShiftKey(context, keyboard); } - if (code == Constants.CODE_ACTION_ENTER) { + if (code == Constants.CODE_ENTER) { + // The following function returns the correct description in all action and + // regular enter cases, taking care of all modes. return getDescriptionForActionKey(context, keyboard, key); } |