am 357c75e7: Merge "Add missing character combinations for international layouts" (10884694) · Commits · e / os / android_frameworks_base

packages/InputDevices/res/raw/keyboard_layout_czech.kcm

+20 −3

Original line number	Original line	Diff line number	Diff line
	@@ -13,7 +13,7 @@
	# limitations under the License.		# limitations under the License.

	#		#
	# Czech keyboard layout.		# Czech (EU - qwerty) keyboard layout.
	#		#

	type OVERLAY		type OVERLAY
	@@ -26,6 +26,8 @@ key GRAVE {
	label: ';'		label: ';'
	base: ';'		base: ';'
	shift: '\u00b0'		shift: '\u00b0'
			ralt: '\u0060'
			shift+ralt: '\u007e'
	}		}

	key 1 {		key 1 {
	@@ -38,6 +40,7 @@ key 1 {
	key 2 {		key 2 {
	label: '2'		label: '2'
	base: '\u011b'		base: '\u011b'
			capslock: '\u011a'
	shift: '2'		shift: '2'
	ralt: '@'		ralt: '@'
	}		}
	@@ -45,6 +48,7 @@ key 2 {
	key 3 {		key 3 {
	label: '3'		label: '3'
	base: '\u0161'		base: '\u0161'
			capslock: '\u0160'
	shift: '3'		shift: '3'
	ralt: '#'		ralt: '#'
	}		}
	@@ -52,6 +56,7 @@ key 3 {
	key 4 {		key 4 {
	label: '4'		label: '4'
	base: '\u010d'		base: '\u010d'
			capslock: '\u010c'
	shift: '4'		shift: '4'
	ralt: '$'		ralt: '$'
	}		}
	@@ -59,6 +64,7 @@ key 4 {
	key 5 {		key 5 {
	label: '5'		label: '5'
	base: '\u0159'		base: '\u0159'
			capslock: '\u0158'
	shift: '5'		shift: '5'
	ralt: '%'		ralt: '%'
	}		}
	@@ -66,6 +72,7 @@ key 5 {
	key 6 {		key 6 {
	label: '6'		label: '6'
	base: '\u017e'		base: '\u017e'
			capslock: '\u017d'
	shift: '6'		shift: '6'
	ralt: '^'		ralt: '^'
	}		}
	@@ -73,6 +80,7 @@ key 6 {
	key 7 {		key 7 {
	label: '7'		label: '7'
	base: '\u00fd'		base: '\u00fd'
			capslock: '\u00dd'
	shift: '7'		shift: '7'
	ralt: '&'		ralt: '&'
	}		}
	@@ -80,6 +88,7 @@ key 7 {
	key 8 {		key 8 {
	label: '8'		label: '8'
	base: '\u00e1'		base: '\u00e1'
			capslock: '\u00c1'
	shift: '8'		shift: '8'
	ralt: '*'		ralt: '*'
	}		}
	@@ -87,6 +96,7 @@ key 8 {
	key 9 {		key 9 {
	label: '9'		label: '9'
	base: '\u00ed'		base: '\u00ed'
			capslock: '\u00cd'
	shift: '9'		shift: '9'
	ralt: '('		ralt: '('
	}		}
	@@ -94,6 +104,7 @@ key 9 {
	key 0 {		key 0 {
	label: '0'		label: '0'
	base: '\u00e9'		base: '\u00e9'
			capslock: '\u00c9'
	shift: '0'		shift: '0'
	ralt: ')'		ralt: ')'
	}		}
	@@ -180,6 +191,7 @@ key P {
	key LEFT_BRACKET {		key LEFT_BRACKET {
	label: '\u00fa'		label: '\u00fa'
	base: '\u00fa'		base: '\u00fa'
			capslock: '\u00da'
	shift: '/'		shift: '/'
	ralt: '['		ralt: '['
	ralt+shift: '{'		ralt+shift: '{'
	@@ -252,6 +264,7 @@ key L {
	key SEMICOLON {		key SEMICOLON {
	label: '\u016f'		label: '\u016f'
	base: '\u016f'		base: '\u016f'
			capslock: '\u016e'
	shift: '"'		shift: '"'
	ralt: ';'		ralt: ';'
	ralt+shift: ':'		ralt+shift: ':'
	@@ -261,8 +274,8 @@ key APOSTROPHE {
	label: '\u00a7'		label: '\u00a7'
	base: '\u00a7'		base: '\u00a7'
	shift: '!'		shift: '!'
	ralt: '\''		ralt: '\u00a4'
	ralt+shift: '"'		ralt+shift: '\u005e'
	}		}

	key BACKSLASH {		key BACKSLASH {
	@@ -279,6 +292,8 @@ key PLUS {
	label: '\\'		label: '\\'
	base: '\\'		base: '\\'
	shift: '\|'		shift: '\|'
			ralt: '\u00df'
			shift+ralt: '\u02dd'
	}		}

	key Z {		key Z {
	@@ -330,6 +345,7 @@ key COMMA {
	base: ','		base: ','
	shift: '?'		shift: '?'
	ralt: '<'		ralt: '<'
			shift+ralt: '\u00d7'
	}		}

	key PERIOD {		key PERIOD {
	@@ -337,6 +353,7 @@ key PERIOD {
	base: '.'		base: '.'
	shift: ':'		shift: ':'
	ralt: '>'		ralt: '>'
			shift+ralt: '\u00f7'
	}		}

	key SLASH {		key SLASH {

packages/InputDevices/res/raw/keyboard_layout_english_us_intl.kcm

+15 −15

Original line number	Original line	Diff line number	Diff line
	@@ -122,7 +122,7 @@ key Q {
	base: 'q'		base: 'q'
	shift, capslock: 'Q'		shift, capslock: 'Q'
	ralt: '\u00e4'		ralt: '\u00e4'
	shift+ralt: '\u00c4'		shift+ralt, capslock+ralt: '\u00c4'
	}		}

	key W {		key W {
	@@ -130,7 +130,7 @@ key W {
	base: 'w'		base: 'w'
	shift, capslock: 'W'		shift, capslock: 'W'
	ralt: '\u00e5'		ralt: '\u00e5'
	shift+ralt: '\u00c5'		shift+ralt, capslock+ralt: '\u00c5'
	}		}

	key E {		key E {
	@@ -138,7 +138,7 @@ key E {
	base: 'e'		base: 'e'
	shift, capslock: 'E'		shift, capslock: 'E'
	ralt: '\u00e9'		ralt: '\u00e9'
	shift+ralt: '\u00c9'		shift+ralt, capslock+ralt: '\u00c9'
	}		}

	key R {		key R {
	@@ -153,7 +153,7 @@ key T {
	base: 't'		base: 't'
	shift, capslock: 'T'		shift, capslock: 'T'
	ralt: '\u00fe'		ralt: '\u00fe'
	shift+ralt: '\u00de'		shift+ralt, capslock+ralt: '\u00de'
	}		}

	key Y {		key Y {
	@@ -161,7 +161,7 @@ key Y {
	base: 'y'		base: 'y'
	shift, capslock: 'Y'		shift, capslock: 'Y'
	ralt: '\u00fc'		ralt: '\u00fc'
	shift+ralt: '\u00dc'		shift+ralt, capslock+ralt: '\u00dc'
	}		}

	key U {		key U {
	@@ -169,7 +169,7 @@ key U {
	base: 'u'		base: 'u'
	shift, capslock: 'U'		shift, capslock: 'U'
	ralt: '\u00fa'		ralt: '\u00fa'
	shift+ralt: '\u00da'		shift+ralt, capslock+ralt: '\u00da'
	}		}

	key I {		key I {
	@@ -177,7 +177,7 @@ key I {
	base: 'i'		base: 'i'
	shift, capslock: 'I'		shift, capslock: 'I'
	ralt: '\u00ed'		ralt: '\u00ed'
	shift+ralt: '\u00cd'		shift+ralt, capslock+ralt: '\u00cd'
	}		}

	key O {		key O {
	@@ -185,7 +185,7 @@ key O {
	base: 'o'		base: 'o'
	shift, capslock: 'O'		shift, capslock: 'O'
	ralt: '\u00f3'		ralt: '\u00f3'
	shift+ralt: '\u00d3'		shift+ralt, capslock+ralt: '\u00d3'
	}		}

	key P {		key P {
	@@ -193,7 +193,7 @@ key P {
	base: 'p'		base: 'p'
	shift, capslock: 'P'		shift, capslock: 'P'
	ralt: '\u00f6'		ralt: '\u00f6'
	shift+ralt: '\u00d6'		shift+ralt, capslock+ralt: '\u00d6'
	}		}

	key LEFT_BRACKET {		key LEFT_BRACKET {
	@@ -225,7 +225,7 @@ key A {
	base: 'a'		base: 'a'
	shift, capslock: 'A'		shift, capslock: 'A'
	ralt: '\u00e1'		ralt: '\u00e1'
	shift+ralt: '\u00c1'		shift+ralt, ralt+capslock: '\u00c1'
	}		}

	key S {		key S {
	@@ -241,7 +241,7 @@ key D {
	base: 'd'		base: 'd'
	shift, capslock: 'D'		shift, capslock: 'D'
	ralt: '\u00f0'		ralt: '\u00f0'
	shift+ralt: '\u00d0'		shift+ralt, capslock+ralt: '\u00d0'
	}		}

	key F {		key F {
	@@ -279,7 +279,7 @@ key L {
	base: 'l'		base: 'l'
	shift, capslock: 'L'		shift, capslock: 'L'
	ralt: '\u00f8'		ralt: '\u00f8'
	shift+ralt: '\u00d8'		shift+ralt, capslock+ralt: '\u00d8'
	}		}

	key SEMICOLON {		key SEMICOLON {
	@@ -313,7 +313,7 @@ key Z {
	base: 'z'		base: 'z'
	shift, capslock: 'Z'		shift, capslock: 'Z'
	ralt: '\u00e6'		ralt: '\u00e6'
	shift+ralt: '\u00c6'		shift+ralt, capslock+ralt: '\u00c6'
	}		}

	key X {		key X {
	@@ -347,7 +347,7 @@ key N {
	base: 'n'		base: 'n'
	shift, capslock: 'N'		shift, capslock: 'N'
	ralt: '\u00f1'		ralt: '\u00f1'
	shift+ralt: '\u00d1'		shift+ralt, capslock+ralt: '\u00d1'
	}		}

	key M {		key M {
	@@ -362,7 +362,7 @@ key COMMA {
	base: ','		base: ','
	shift: '<'		shift: '<'
	ralt: '\u00e7'		ralt: '\u00e7'
	shift+ralt: '\u00c7'		shift+ralt, capslock+ralt: '\u00c7'
	}		}

	key PERIOD {		key PERIOD {

packages/InputDevices/res/raw/keyboard_layout_slovak.kcm

+35 −34

Original line number	Original line	Diff line number	Diff line
	@@ -13,7 +13,7 @@
	# limitations under the License.		# limitations under the License.

	#		#
	# Slovak keyboard layout.		# Slovak (EU - qwerty) keyboard layout.
	#		#

	type OVERLAY		type OVERLAY
	@@ -26,94 +26,90 @@ key GRAVE {
	label: ';'		label: ';'
	base: ';'		base: ';'
	shift: '\u00b0'		shift: '\u00b0'
	ralt: '`'
	ralt+shift: '~'
	}		}

	key 1 {		key 1 {
	label: '1'		label: '1'
	base: '+'		base: '+'
	shift: '1'		shift: '1'
	ralt: '!'		ralt: '~'
	}		}

	key 2 {		key 2 {
	label: '2'		label: '2'
	base: '\u013e'		base: '\u013e'
	shift: '2'		shift: '2'
	ralt: '@'		ralt: '\u02c7'
	}		}

	key 3 {		key 3 {
	label: '3'		label: '3'
	base: '\u0161'		base: '\u0161'
	shift: '3'		shift: '3'
	ralt: '#'		ralt: '\u0302'
	}		}

	key 4 {		key 4 {
	label: '4'		label: '4'
	base: '\u010d'		base: '\u010d'
	shift: '4'		shift: '4'
	ralt: '$'		ralt: '\u02d8'
	}		}

	key 5 {		key 5 {
	label: '5'		label: '5'
	base: '\u0165'		base: '\u0165'
	shift: '5'		shift: '5'
	ralt: '%'		ralt: '\u00b0'
	}		}

	key 6 {		key 6 {
	label: '6'		label: '6'
	base: '\u017e'		base: '\u017e'
	shift: '6'		shift: '6'
	ralt: '^'		ralt: '\u02db'
	}		}

	key 7 {		key 7 {
	label: '7'		label: '7'
	base: '\u00fd'		base: '\u00fd'
	shift: '7'		shift: '7'
	ralt: '&'		ralt: '\u0300'
	}		}

	key 8 {		key 8 {
	label: '8'		label: '8'
	base: '\u00e1'		base: '\u00e1'
	shift: '8'		shift: '8'
	ralt: '*'		ralt: '\u02d9'
	}		}

	key 9 {		key 9 {
	label: '9'		label: '9'
	base: '\u00ed'		base: '\u00ed'
	shift: '9'		shift: '9'
	ralt: '('		ralt: '\u0301'
	}		}

	key 0 {		key 0 {
	label: '0'		label: '0'
	base: '\u00e9'		base: '\u00e9'
	shift: '0'		shift: '0'
	ralt: ')'		ralt: '\u02dd'
	}		}

	key MINUS {		key MINUS {
	label: '='		label: '='
	base: '='		base: '='
	shift: '%'		shift: '%'
	ralt: '-'		ralt: '\u0308'
	ralt+shift: '_'
	}		}

	key EQUALS {		key EQUALS {
	label: '\u00b4'		label: '\u00b4'
	base: '\u0301'		base: '\u0301'
	shift: '\u030c'		shift: '\u030c'
	ralt: '='		ralt: '\u00b8'
	ralt+shift: '+'
	}		}

	### ROW 2		### ROW 2
	@@ -179,22 +175,21 @@ key P {
	label: 'P'		label: 'P'
	base: 'p'		base: 'p'
	shift, capslock: 'P'		shift, capslock: 'P'
			ralt: '\''
	}		}

	key LEFT_BRACKET {		key LEFT_BRACKET {
	label: '\u00fa'		label: '\u00fa'
	base: '\u00fa'		base: '\u00fa'
	shift: '/'		shift: '/'
	ralt: '['		ralt: '\u00f7'
	ralt+shift: '{'
	}		}

	key RIGHT_BRACKET {		key RIGHT_BRACKET {
	label: '\u00e4'		label: '\u00e4'
	base: '\u00e4'		base: '\u00e4'
	shift: '('		shift: '('
	ralt: ']'		ralt: '\u00d7'
	ralt+shift: '}'
	}		}

	### ROW 3		### ROW 3
	@@ -209,24 +204,28 @@ key S {
	label: 'S'		label: 'S'
	base: 's'		base: 's'
	shift, capslock: 'S'		shift, capslock: 'S'
			ralt: '\u0111'
	}		}

	key D {		key D {
	label: 'D'		label: 'D'
	base: 'd'		base: 'd'
	shift, capslock: 'D'		shift, capslock: 'D'
			ralt: '\u0110'
	}		}

	key F {		key F {
	label: 'F'		label: 'F'
	base: 'f'		base: 'f'
	shift, capslock: 'F'		shift, capslock: 'F'
			ralt: '['
	}		}

	key G {		key G {
	label: 'G'		label: 'G'
	base: 'g'		base: 'g'
	shift, capslock: 'G'		shift, capslock: 'G'
			ralt: ']'
	}		}

	key H {		key H {
	@@ -245,64 +244,65 @@ key K {
	label: 'K'		label: 'K'
	base: 'k'		base: 'k'
	shift, capslock: 'K'		shift, capslock: 'K'
			ralt: '\u0142'
	}		}

	key L {		key L {
	label: 'L'		label: 'L'
	base: 'l'		base: 'l'
	shift, capslock: 'L'		shift, capslock: 'L'
			ralt: '\u0141'
	}		}

	key SEMICOLON {		key SEMICOLON {
	label: '\u00f4'		label: '\u00f4'
	base: '\u00f4'		base: '\u00f4'
	shift: '"'		shift: '"'
	ralt: ';'		ralt: '$'
	ralt+shift: ':'
	}		}

	key APOSTROPHE {		key APOSTROPHE {
	label: '\u00a7'		label: '\u00a7'
	base: '\u00a7'		base: '\u00a7'
	shift: '!'		shift: '!'
	ralt: '\''		ralt: '\u00df'
	ralt+shift: '"'
	}		}

	key BACKSLASH {		key BACKSLASH {
	label: '\u0148'		label: '\u0148'
	base: '\u0148'		base: '\u0148'
	shift: ')'		shift: ')'
	ralt: '\\'		ralt: '\u00a4'
	ralt+shift: '\|'
	}		}

	### ROW 4		### ROW 4

	key PLUS {		key PLUS {
	label: '\\'		label: '&'
	base: '\\'		base: '&'
	shift: '\|'		shift: '*'
	ralt: '&'		ralt: '<'
	ralt+shift: '*'
	}		}

	key Z {		key Z {
	label: 'Z'		label: 'Z'
	base: 'z'		base: 'z'
	shift, capslock: 'Z'		shift, capslock: 'Z'
			ralt: '>'
	}		}

	key X {		key X {
	label: 'X'		label: 'X'
	base: 'x'		base: 'x'
	shift, capslock: 'X'		shift, capslock: 'X'
			ralt: '#'
	}		}

	key C {		key C {
	label: 'C'		label: 'C'
	base: 'c'		base: 'c'
	shift, capslock: 'C'		shift, capslock: 'C'
			ralt: '&'
	}		}

	key V {		key V {
	@@ -316,12 +316,14 @@ key B {
	label: 'B'		label: 'B'
	base: 'b'		base: 'b'
	shift, capslock: 'B'		shift, capslock: 'B'
			ralt: '{'
	}		}

	key N {		key N {
	label: 'N'		label: 'N'
	base: 'n'		base: 'n'
	shift, capslock: 'N'		shift, capslock: 'N'
			ralt: '}'
	}		}

	key M {		key M {
	@@ -348,6 +350,5 @@ key SLASH {
	label: '-'		label: '-'
	base: '-'		base: '-'
	shift: '_'		shift: '_'
	ralt: '/'		ralt: '*'
	ralt+shift: '?'
	}		}

packages/InputDevices/res/raw/keyboard_layout_swiss_french.kcm

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -56,12 +56,14 @@ key 4 {
	label: '4'		label: '4'
	base: '4'		base: '4'
	shift: '\u00e7'		shift: '\u00e7'
			ralt: '\u00b0'
	}		}

	key 5 {		key 5 {
	label: '5'		label: '5'
	base: '5'		base: '5'
	shift: '%'		shift: '%'
			ralt: '\u00a7'
	}		}

	key 6 {		key 6 {

packages/InputDevices/res/raw/keyboard_layout_swiss_german.kcm

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -56,12 +56,14 @@ key 4 {
	label: '4'		label: '4'
	base: '4'		base: '4'
	shift: '\u00e7'		shift: '\u00e7'
			ralt: '\u00b0'
	}		}

	key 5 {		key 5 {
	label: '5'		label: '5'
	base: '5'		base: '5'
	shift: '%'		shift: '%'
			ralt: '\u00a7'
	}		}

	key 6 {		key 6 {
	@@ -178,6 +180,8 @@ key LEFT_BRACKET {
	label: '\u00fc'		label: '\u00fc'
	base: '\u00fc'		base: '\u00fc'
	shift: '\u00e8'		shift: '\u00e8'
			capslock: '\u00dc'
			capslock+shift: '\u00c8'
	ralt: '['		ralt: '['
	}		}

	@@ -248,12 +252,16 @@ key SEMICOLON {
	label: '\u00f6'		label: '\u00f6'
	base: '\u00f6'		base: '\u00f6'
	shift: '\u00e9'		shift: '\u00e9'
			capslock: '\u00d6'
			capslock+shift: '\u00c9'
	}		}

	key APOSTROPHE {		key APOSTROPHE {
	label: '\u00e4'		label: '\u00e4'
	base: '\u00e4'		base: '\u00e4'
	shift: '\u00e0'		shift: '\u00e0'
			capslock: '\u00c4'
			capslock+shift: '\u00c0'
	ralt: '{'		ralt: '{'
	}		}