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/keyboard/internal/KeyboardCodesSet.java | |
| parent | c3252cfaf750d706f7280d32d1259e4367670bd9 (diff) | |
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/keyboard/internal/KeyboardCodesSet.java')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/internal/KeyboardCodesSet.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardCodesSet.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardCodesSet.java index 0ec6b0176..3e25c3b86 100644 --- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardCodesSet.java +++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardCodesSet.java @@ -48,7 +48,6 @@ public final class KeyboardCodesSet { "key_delete", "key_settings", "key_shortcut", - "key_action_enter", "key_action_next", "key_action_previous", "key_shift_enter", @@ -85,7 +84,6 @@ public final class KeyboardCodesSet { Constants.CODE_DELETE, Constants.CODE_SETTINGS, Constants.CODE_SHORTCUT, - Constants.CODE_ACTION_ENTER, Constants.CODE_ACTION_NEXT, Constants.CODE_ACTION_PREVIOUS, Constants.CODE_SHIFT_ENTER, @@ -118,7 +116,6 @@ public final class KeyboardCodesSet { DEFAULT[12], DEFAULT[13], DEFAULT[14], - DEFAULT[15], CODE_RIGHT_PARENTHESIS, CODE_LEFT_PARENTHESIS, CODE_GREATER_THAN_SIGN, @@ -142,7 +139,7 @@ public final class KeyboardCodesSet { }; static { - if (DEFAULT.length != RTL.length) { + if (DEFAULT.length != RTL.length || DEFAULT.length != ID_TO_NAME.length) { throw new RuntimeException("Internal inconsistency"); } for (int i = 0; i < ID_TO_NAME.length; i++) { |