Support keyboard entry of non-ASCII characters

Add characters to the keyboard mapping to allow them
to be entered into the AVD from the developer's PC
keyboard.

This mapping supports the non-ASCII keys that appear
on the "US International" keyboard. Most of the Latin-1
characters (but not all) appear on this keyboard.

This change does not remove support for any keys.

b.android.com/200042

Change-Id: I65d54eb36183382b171c388b26848941eb0ff8d9
(cherry picked from commit dac57966a9)
This commit is contained in:
Jim Kaye
2016-02-11 08:27:51 -08:00
parent b67985f337
commit b57679e2e7

View File

@@ -23,8 +23,8 @@ key A {
number: '2' number: '2'
base: 'a' base: 'a'
shift, capslock: 'A' shift, capslock: 'A'
alt: 'a' alt: '\u00e1'
shift+alt, capslock+alt: 'A' shift+alt, capslock+alt: '\u00c1'
} }
key B { key B {
@@ -41,8 +41,8 @@ key C {
number: '2' number: '2'
base: 'c' base: 'c'
shift, capslock: 'C' shift, capslock: 'C'
alt: '\u00e7' alt: '\u00a9'
shift+alt, capslock+alt: '\u00e7' shift+alt, capslock+alt: '\u00a2'
} }
key D { key D {
@@ -50,8 +50,8 @@ key D {
number: '3' number: '3'
base: 'd' base: 'd'
shift, capslock: 'D' shift, capslock: 'D'
alt: '\'' alt: '\u00f0'
shift+alt, capslock+alt: '\'' shift+alt, capslock+alt: '\u00d0'
} }
key E { key E {
@@ -59,8 +59,8 @@ key E {
number: '3' number: '3'
base: 'e' base: 'e'
shift, capslock: 'E' shift, capslock: 'E'
alt: '"' alt: '\u00e9'
shift+alt, capslock+alt: '\u0301' shift+alt, capslock+alt: '\u00c9'
} }
key F { key F {
@@ -95,8 +95,8 @@ key I {
number: '4' number: '4'
base: 'i' base: 'i'
shift, capslock: 'I' shift, capslock: 'I'
alt: '-' alt: '\u00ed'
shift+alt, capslock+alt: '\u0302' shift+alt, capslock+alt: '\u00cd'
} }
key J { key J {
@@ -122,8 +122,8 @@ key L {
number: '5' number: '5'
base: 'l' base: 'l'
shift, capslock: 'L' shift, capslock: 'L'
alt: ':' alt: '\u00f8'
shift+alt, capslock+alt: '`' shift+alt, capslock+alt: '\u00d8'
} }
key M { key M {
@@ -131,7 +131,7 @@ key M {
number: '6' number: '6'
base: 'm' base: 'm'
shift, capslock: 'M' shift, capslock: 'M'
alt: '%' alt: '\u00b5'
shift+alt, capslock+alt: none shift+alt, capslock+alt: none
} }
@@ -140,8 +140,8 @@ key N {
number: '6' number: '6'
base: 'n' base: 'n'
shift, capslock: 'N' shift, capslock: 'N'
alt: none alt: '\u00f1'
shift+alt, capslock+alt: '\u0303' shift+alt, capslock+alt: '\u00d1'
} }
key O { key O {
@@ -149,8 +149,8 @@ key O {
number: '6' number: '6'
base: 'o' base: 'o'
shift, capslock: 'O' shift, capslock: 'O'
alt: '+' alt: '\u00f3'
shift+alt, capslock+alt: '+' shift+alt, capslock+alt: '\u00d3'
} }
key P { key P {
@@ -158,8 +158,8 @@ key P {
number: '7' number: '7'
base: 'p' base: 'p'
shift, capslock: 'P' shift, capslock: 'P'
alt: '=' alt: '\u00f6'
shift+alt, capslock+alt: '\u00a5' shift+alt, capslock+alt: '\u00d6'
} }
key Q { key Q {
@@ -167,8 +167,8 @@ key Q {
number: '7' number: '7'
base: 'q' base: 'q'
shift, capslock: 'Q' shift, capslock: 'Q'
alt: '|' alt: '\u00e4'
shift+alt, capslock+alt: '\u0300' shift+alt, capslock+alt: '\u00c4'
} }
key R { key R {
@@ -176,8 +176,8 @@ key R {
number: '7' number: '7'
base: 'r' base: 'r'
shift, capslock: 'R' shift, capslock: 'R'
alt: '`' alt: '\u00ae'
shift+alt, capslock+alt: '\u20ac' shift+alt, capslock+alt: 'R'
} }
key S { key S {
@@ -185,8 +185,8 @@ key S {
number: '7' number: '7'
base: 's' base: 's'
shift, capslock: 'S' shift, capslock: 'S'
alt: '\\' alt: '\u00df'
shift+alt, capslock+alt: '\u00df' shift+alt, capslock+alt: '\u00a7'
} }
key T { key T {
@@ -194,8 +194,8 @@ key T {
number: '8' number: '8'
base: 't' base: 't'
shift, capslock: 'T' shift, capslock: 'T'
alt: '{' alt: '\u00fe'
shift+alt, capslock+alt: '\u00a3' shift+alt, capslock+alt: '\u00de'
} }
key U { key U {
@@ -203,8 +203,8 @@ key U {
number: '8' number: '8'
base: 'u' base: 'u'
shift, capslock: 'U' shift, capslock: 'U'
alt: '_' alt: '\u00fa'
shift+alt, capslock+alt: '\u0308' shift+alt, capslock+alt: '\u00da'
} }
key V { key V {
@@ -221,8 +221,8 @@ key W {
number: '9' number: '9'
base: 'w' base: 'w'
shift, capslock: 'W' shift, capslock: 'W'
alt: '~' alt: '\u00e5'
shift+alt, capslock+alt: '~' shift+alt, capslock+alt: '\u00c5'
} }
key X { key X {
@@ -239,8 +239,8 @@ key Y {
number: '9' number: '9'
base: 'y' base: 'y'
shift, capslock: 'Y' shift, capslock: 'Y'
alt: '}' alt: '\u00fc'
shift+alt, capslock+alt: '\u00a1' shift+alt, capslock+alt: '\u00dc'
} }
key Z { key Z {
@@ -248,8 +248,8 @@ key Z {
number: '9' number: '9'
base: 'z' base: 'z'
shift, capslock: 'Z' shift, capslock: 'Z'
alt: 'z' alt: '\u00e6'
shift+alt, capslock+alt: 'Z' shift+alt, capslock+alt: '\u00c6'
} }
key COMMA { key COMMA {
@@ -257,8 +257,8 @@ key COMMA {
number: ',' number: ','
base: ',' base: ','
shift: '<' shift: '<'
alt: ',' alt: '\u00e7'
shift+alt: ',' shift+alt: '\u00c7'
} }
key PERIOD { key PERIOD {
@@ -284,7 +284,7 @@ key SLASH {
number: '/' number: '/'
base: '/' base: '/'
shift: '?' shift: '?'
alt: '?' alt: '\u00bf'
shift+alt: '?' shift+alt: '?'
} }
@@ -320,7 +320,7 @@ key 0 {
number: '0' number: '0'
base: '0' base: '0'
shift: ')' shift: ')'
alt: ')' alt: '\u02bc'
shift+alt: ')' shift+alt: ')'
} }
@@ -329,8 +329,8 @@ key 1 {
number: '1' number: '1'
base: '1' base: '1'
shift: '!' shift: '!'
alt: '!' alt: '\u00a1'
shift+alt: '!' shift+alt: '\u00b9'
} }
key 2 { key 2 {
@@ -338,7 +338,7 @@ key 2 {
number: '2' number: '2'
base: '2' base: '2'
shift: '@' shift: '@'
alt: '@' alt: '\u00b2'
shift+alt: '@' shift+alt: '@'
} }
@@ -347,7 +347,7 @@ key 3 {
number: '3' number: '3'
base: '3' base: '3'
shift: '#' shift: '#'
alt: '#' alt: '\u00b3'
shift+alt: '#' shift+alt: '#'
} }
@@ -356,8 +356,8 @@ key 4 {
number: '4' number: '4'
base: '4' base: '4'
shift: '$' shift: '$'
alt: '$' alt: '\u00a4'
shift+alt: '$' shift+alt: '\u00a3'
} }
key 5 { key 5 {
@@ -365,7 +365,7 @@ key 5 {
number: '5' number: '5'
base: '5' base: '5'
shift: '%' shift: '%'
alt: '%' alt: '\u20ac'
shift+alt: '%' shift+alt: '%'
} }
@@ -374,8 +374,8 @@ key 6 {
number: '6' number: '6'
base: '6' base: '6'
shift: '^' shift: '^'
alt: '^' alt: '\u00bc'
shift+alt: '^' shift+alt: '\u0302'
} }
key 7 { key 7 {
@@ -383,7 +383,7 @@ key 7 {
number: '7' number: '7'
base: '7' base: '7'
shift: '&' shift: '&'
alt: '&' alt: '\u00bd'
shift+alt: '&' shift+alt: '&'
} }
@@ -392,7 +392,7 @@ key 8 {
number: '8' number: '8'
base: '8' base: '8'
shift: '*' shift: '*'
alt: '*' alt: '\u00be'
shift+alt: '*' shift+alt: '*'
} }
@@ -401,7 +401,7 @@ key 9 {
number: '9' number: '9'
base: '9' base: '9'
shift: '(' shift: '('
alt: '(' alt: '\u02bb'
shift+alt: '(' shift+alt: '('
} }
@@ -410,8 +410,8 @@ key GRAVE {
number: '`' number: '`'
base: '`' base: '`'
shift: '~' shift: '~'
alt: '`' alt: '\u0300'
shift+alt: '~' shift+alt: '\u0303'
} }
key MINUS { key MINUS {
@@ -419,7 +419,7 @@ key MINUS {
number: '-' number: '-'
base: '-' base: '-'
shift: '_' shift: '_'
alt: '-' alt: '\u00a5'
shift+alt: '_' shift+alt: '_'
} }
@@ -428,8 +428,8 @@ key EQUALS {
number: '=' number: '='
base: '=' base: '='
shift: '+' shift: '+'
alt: '=' alt: '\u00d7'
shift+alt: '+' shift+alt: '\u00f7'
} }
key LEFT_BRACKET { key LEFT_BRACKET {
@@ -437,7 +437,7 @@ key LEFT_BRACKET {
number: '[' number: '['
base: '[' base: '['
shift: '{' shift: '{'
alt: '[' alt: '\u00ab'
shift+alt: '{' shift+alt: '{'
} }
@@ -446,7 +446,7 @@ key RIGHT_BRACKET {
number: ']' number: ']'
base: ']' base: ']'
shift: '}' shift: '}'
alt: ']' alt: '\u00bb'
shift+alt: '}' shift+alt: '}'
} }
@@ -455,8 +455,8 @@ key BACKSLASH {
number: '\\' number: '\\'
base: '\\' base: '\\'
shift: '|' shift: '|'
alt: '\\' alt: '\u00ac'
shift+alt: '|' shift+alt: '\u00a6'
} }
key SEMICOLON { key SEMICOLON {
@@ -464,8 +464,8 @@ key SEMICOLON {
number: ';' number: ';'
base: ';' base: ';'
shift: ':' shift: ':'
alt: ';' alt: '\u00b6'
shift+alt: ':' shift+alt: '\u00b0'
} }
key APOSTROPHE { key APOSTROPHE {
@@ -473,8 +473,8 @@ key APOSTROPHE {
number: '\'' number: '\''
base: '\'' base: '\''
shift: '"' shift: '"'
alt: '\'' alt: '\u0301'
shift+alt: '"' shift+alt: '\u0308'
} }
key STAR { key STAR {