diff options
| author |   Jean Chalard <jchalard@google.com> | 2013-02-19 11:45:44 -0800 |
|---|---|---|
| committer | Jean Chalard <jchalard@google.com> | 2013-02-22 16:01:37 -0800 |
| commit | 4e4f88127b6a75302fac3a004e41fff1899a773f (patch) | |
| tree | f37956c103dceb85ed283943acfdb80e4792b020 /java/src/com/android/inputmethod/accessibility/KeyCodeDescriptionMapper.java | |
| parent | c3252cfaf750d706f7280d32d1259e4367670bd9 (diff) | |
| download | latinime-4e4f88127b6a75302fac3a004e41fff1899a773f.tar.gz latinime-4e4f88127b6a75302fac3a004e41fff1899a773f.tar.xz latinime-4e4f88127b6a75302fac3a004e41fff1899a773f.zip | |
Fix how the Enter action is decided
This unifies the software and hardware keyboard code
under a single decision process that works.
Bug: 8129303
Bug: 8152758
Change-Id: I7574c563d5f957d57bfe62fe5e3eec59a519d335
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); } |