am 4cbe84ad: Merge "Fix RTL language key code mapping"

# Via Android (Google) Code Review (1) and Tadashi G. Takaoka (1)
* commit '4cbe84ad08f38bf9c6f8852b406f5052e862a747':
  Fix RTL language key code mapping
main
Tadashi G. Takaoka 2013-02-11 22:45:16 -08:00 committed by Android Git Automerger
commit a869080b04
1 changed files with 5 additions and 0 deletions

View File

@ -74,6 +74,7 @@ public final class KeyboardCodesSet {
private static final int CODE_LEFT_CURLY_BRACKET = '{'; private static final int CODE_LEFT_CURLY_BRACKET = '{';
private static final int CODE_RIGHT_CURLY_BRACKET = '}'; private static final int CODE_RIGHT_CURLY_BRACKET = '}';
// This array should be aligned with the array RTL below.
private static final int[] DEFAULT = { private static final int[] DEFAULT = {
Constants.CODE_TAB, Constants.CODE_TAB,
Constants.CODE_ENTER, Constants.CODE_ENTER,
@ -117,6 +118,7 @@ public final class KeyboardCodesSet {
DEFAULT[12], DEFAULT[12],
DEFAULT[13], DEFAULT[13],
DEFAULT[14], DEFAULT[14],
DEFAULT[15],
CODE_RIGHT_PARENTHESIS, CODE_RIGHT_PARENTHESIS,
CODE_LEFT_PARENTHESIS, CODE_LEFT_PARENTHESIS,
CODE_GREATER_THAN_SIGN, CODE_GREATER_THAN_SIGN,
@ -140,6 +142,9 @@ public final class KeyboardCodesSet {
}; };
static { static {
if (DEFAULT.length != RTL.length) {
throw new RuntimeException("Internal inconsistency");
}
for (int i = 0; i < ID_TO_NAME.length; i++) { for (int i = 0; i < ID_TO_NAME.length; i++) {
sNameToIdMap.put(ID_TO_NAME[i], i); sNameToIdMap.put(ID_TO_NAME[i], i);
} }