aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/accessibility/KeyCodeDescriptionMapper.java
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2013-02-23 00:13:27 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-02-23 00:13:27 +0000
commit8f794c72db07786c866e357c7853c339882b45ef (patch)
tree8ce04710dc0088b3a82d0f5f293db58b0fdf51ef /java/src/com/android/inputmethod/accessibility/KeyCodeDescriptionMapper.java
parent97a5246f7661be4d25e3dd905fd4de476e872bf0 (diff)
parent4e4f88127b6a75302fac3a004e41fff1899a773f (diff)
downloadlatinime-8f794c72db07786c866e357c7853c339882b45ef.tar.gz
latinime-8f794c72db07786c866e357c7853c339882b45ef.tar.xz
latinime-8f794c72db07786c866e357c7853c339882b45ef.zip
Merge "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.java4
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);
}