Merge "Extend support for nordic languages with Sami" (a84d24c3) · Commits · e / os / android_frameworks_base

packages/InputDevices/res/raw/keyboard_layout_danish.kcm

+42 −6

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

		#
		# Danish keyboard layout.
		# Danish (EU based + Sami) keyboard layout.
		#

		type OVERLAY

		map key 12 SLASH
		map key 53 MINUS
		map key 86 PLUS

		### ROW 1
		@@ -61,6 +59,7 @@ key 5 {
		label: '5'
		base: '5'
		shift: '%'
		ralt: '\u20ac'
		}

		key 6 {
		@@ -97,7 +96,7 @@ key 0 {
		ralt: '}'
		}

		key SLASH {
		key MINUS {
		label: '+'
		base: '+'
		shift: '?'
		@@ -116,6 +115,8 @@ key Q {
		label: 'Q'
		base: 'q'
		shift, capslock: 'Q'
		ralt: '\u00e2'
		ralt+capslock, shift+ralt: '\u00c2'
		}

		key W {
		@@ -129,6 +130,7 @@ key E {
		base: 'e'
		shift, capslock: 'E'
		ralt: '\u20ac'
		ralt+capslock: '\u20ac'
		}

		key R {
		@@ -141,6 +143,8 @@ key T {
		label: 'T'
		base: 't'
		shift, capslock: 'T'
		ralt: '\u0167'
		ralt+capslock, shift+ralt: '\u0166'
		}

		key Y {
		@@ -159,12 +163,16 @@ key I {
		label: 'I'
		base: 'i'
		shift, capslock: 'I'
		ralt: '\u00ef'
		ralt+capslock, shift+ralt: '\u00cf'
		}

		key O {
		label: 'O'
		base: 'o'
		shift, capslock: 'O'
		ralt: '\u00f5'
		ralt+capslock, shift+ralt: '\u00d5'
		}

		key P {
		@@ -192,36 +200,48 @@ key A {
		label: 'A'
		base: 'a'
		shift, capslock: 'A'
		ralt: '\u00e1'
		ralt+capslock, shift+ralt: '\u00c1'
		}

		key S {
		label: 'S'
		base: 's'
		shift, capslock: 'S'
		ralt: '\u0161'
		ralt+capslock, shift+ralt: '\u0160'
		}

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

		key F {
		label: 'F'
		base: 'f'
		shift, capslock: 'F'
		ralt: '\u01e5'
		ralt+capslock, shift+ralt: '\u01e4'
		}

		key G {
		label: 'G'
		base: 'g'
		shift, capslock: 'G'
		ralt: '\u01e7'
		ralt+capslock, shift+ralt: '\u01e6'
		}

		key H {
		label: 'H'
		base: 'h'
		shift, capslock: 'H'
		ralt: '\u021f'
		ralt+capslock, shift+ralt: '\u021e'
		}

		key J {
		@@ -234,6 +254,8 @@ key K {
		label: 'K'
		base: 'k'
		shift, capslock: 'K'
		ralt: '\u01e9'
		ralt+capslock, shift+ralt: '\u01e8'
		}

		key L {
		@@ -246,12 +268,16 @@ key SEMICOLON {
		label: '\u00c6'
		base: '\u00e6'
		shift, capslock: '\u00c6'
		ralt: '\u00e4'
		ralt+capslock, shift+ralt: '\u00c4'
		}

		key APOSTROPHE {
		label: '\u00d8'
		base: '\u00f8'
		shift, capslock: '\u00d8'
		ralt: '\u00f6'
		ralt+capslock, shift+ralt: '\u00d6'
		}

		key BACKSLASH {
		@@ -273,6 +299,8 @@ key Z {
		label: 'Z'
		base: 'z'
		shift, capslock: 'Z'
		ralt: '\u017e'
		ralt+capslock, shift+ralt: '\u017d'
		}

		key X {
		@@ -285,31 +313,39 @@ key C {
		label: 'C'
		base: 'c'
		shift, capslock: 'C'
		ralt: '\u010d'
		ralt+capslock, shift+ralt: '\u010c'
		}

		key V {
		label: 'V'
		base: 'v'
		shift, capslock: 'V'
		ralt: '\u01ef'
		ralt+capslock, shift+ralt: '\u01ee'
		}

		key B {
		label: 'B'
		base: 'b'
		shift, capslock: 'B'
		ralt: '\u0292'
		ralt+capslock, shift+ralt: '\u01b7'
		}

		key N {
		label: 'N'
		base: 'n'
		shift, capslock: 'N'
		ralt: '\u014b'
		ralt+capslock, shift+ralt: '\u014a'
		}

		key M {
		label: 'M'
		base: 'm'
		shift, capslock: 'M'
		ralt: '\u00b5'
		ralt, ralt+capslock: '\u00b5'
		}

		key COMMA {
		@@ -324,7 +360,7 @@ key PERIOD {
		shift: ':'
		}

		key MINUS {
		key SLASH {
		label: '-'
		base: '-'
		shift: '_'

packages/InputDevices/res/raw/keyboard_layout_finnish.kcm

+39 −52

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

		#
		# Finnish multilingual keyboard layout.
		# Finnish (& Swedish)(EU based + Sami) keyboard layout.
		#

		type OVERLAY

		map key 12 SLASH
		map key 53 MINUS
		map key 86 PLUS

		### ROW 1
		@@ -28,14 +26,12 @@ key GRAVE {
		label: '\u00a7'
		base: '\u00a7'
		shift: '\u00bd'
		ralt: '\u0335'
		}

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

		key 2 {
		@@ -43,7 +39,6 @@ key 2 {
		base: '2'
		shift: '"'
		ralt: '@'
		ralt+shift: '\u201d'
		}

		key 3 {
		@@ -51,7 +46,6 @@ key 3 {
		base: '3'
		shift: '#'
		ralt: '\u00a3'
		ralt+shift: '\u00bb'
		}

		key 4 {
		@@ -59,23 +53,19 @@ key 4 {
		base: '4'
		shift: '\u00a4'
		ralt: '$'
		ralt+shift: '\u00ab'
		}

		key 5 {
		label: '5'
		base: '5'
		shift: '%'
		ralt: '\u2030'
		ralt+shift: '\u201c'
		ralt: '\u20ac'
		}

		key 6 {
		label: '6'
		base: '6'
		shift: '&'
		ralt: '\u201a'
		ralt+shift: '\u201e'
		}

		key 7 {
		@@ -104,23 +94,19 @@ key 0 {
		base: '0'
		shift: '='
		ralt: '}'
		ralt+shift: '\u00b0'
		}

		key SLASH {
		key MINUS {
		label: '+'
		base: '+'
		shift: '?'
		ralt: '\\'
		ralt+shift: '\u00bf'
		}

		key EQUALS {
		label: '\u00b4'
		base: '\u0301'
		shift: '\u0300'
		ralt: '\u0327'
		ralt+shift: '\u0328'
		}

		### ROW 2
		@@ -129,6 +115,8 @@ key Q {
		label: 'Q'
		base: 'q'
		shift, capslock: 'Q'
		ralt: '\u00e2'
		ralt+capslock, shift+ralt: '\u00c2'
		}

		key W {
		@@ -142,6 +130,7 @@ key E {
		base: 'e'
		shift, capslock: 'E'
		ralt: '\u20ac'
		ralt+capslock: '\u20ac'
		}

		key R {
		@@ -154,8 +143,8 @@ key T {
		label: 'T'
		base: 't'
		shift, capslock: 'T'
		ralt: '\u00fe'
		ralt+shift, ralt+capslock: '\u00de'
		ralt: '\u0167'
		ralt+capslock, shift+ralt: '\u0166'
		}

		key Y {
		@@ -174,31 +163,28 @@ key I {
		label: 'I'
		base: 'i'
		shift, capslock: 'I'
		ralt: '\u0131'
		ralt: '\u00ef'
		ralt+capslock, shift+ralt: '\u00cf'
		}

		key O {
		label: 'O'
		base: 'o'
		shift, capslock: 'O'
		ralt: '\u0153'
		ralt+shift, ralt+capslock: '\u0152'
		ralt: '\u00f5'
		ralt+capslock, shift+ralt: '\u00d5'
		}

		key P {
		label: 'P'
		base: 'p'
		shift, capslock: 'P'
		ralt: '\u031b'
		ralt+shift: '\u0309'
		}

		key LEFT_BRACKET {
		label: '\u00c5'
		base: '\u00e5'
		shift, capslock: '\u00c5'
		ralt: '\u030b'
		ralt+shift: '\u030a'
		}

		key RIGHT_BRACKET {
		@@ -206,7 +192,6 @@ key RIGHT_BRACKET {
		base: '\u0308'
		shift: '\u0302'
		ralt: '\u0303'
		ralt+shift: '\u0304'
		}

		### ROW 3
		@@ -215,41 +200,48 @@ key A {
		label: 'A'
		base: 'a'
		shift, capslock: 'A'
		ralt: '\u0259'
		ralt+shift, ralt+capslock: '\u018f'
		ralt: '\u00e1'
		ralt+capslock, shift+ralt: '\u00c1'
		}

		key S {
		label: 'S'
		base: 's'
		shift, capslock: 'S'
		ralt: '\u00df'
		ralt: '\u0161'
		ralt+capslock, shift+ralt: '\u0160'
		}

		key D {
		label: 'D'
		base: 'd'
		shift, capslock: 'D'
		ralt: '\u00f0'
		ralt+shift, ralt+capslock: '\u00d0'
		ralt: '\u0111'
		ralt+capslock, shift+ralt: '\u0110'
		}

		key F {
		label: 'F'
		base: 'f'
		shift, capslock: 'F'
		ralt: '\u01e5'
		ralt+capslock, shift+ralt: '\u01e4'
		}

		key G {
		label: 'G'
		base: 'g'
		shift, capslock: 'G'
		ralt: '\u01e7'
		ralt+capslock, shift+ralt: '\u01e6'
		}

		key H {
		label: 'H'
		base: 'h'
		shift, capslock: 'H'
		ralt: '\u021f'
		ralt+capslock, shift+ralt: '\u021e'
		}

		key J {
		@@ -262,14 +254,14 @@ key K {
		label: 'K'
		base: 'k'
		shift, capslock: 'K'
		ralt: '\u0138'
		ralt: '\u01e9'
		ralt+capslock, shift+ralt: '\u01e8'
		}

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

		key SEMICOLON {
		@@ -277,7 +269,7 @@ key SEMICOLON {
		base: '\u00f6'
		shift, capslock: '\u00d6'
		ralt: '\u00f8'
		ralt+shift, ralt+capslock: '\u00d8'
		ralt+capslock, shift+ralt: '\u00d8'
		}

		key APOSTROPHE {
		@@ -285,15 +277,13 @@ key APOSTROPHE {
		base: '\u00e4'
		shift, capslock: '\u00c4'
		ralt: '\u00e6'
		ralt+shift, ralt+capslock: '\u00c6'
		ralt+capslock, shift+ralt: '\u00c6'
		}

		key BACKSLASH {
		label: '\''
		base: '\''
		shift: '*'
		ralt: '\u030c'
		ralt+shift: '\u0306'
		}

		### ROW 4
		@@ -309,34 +299,38 @@ key Z {
		label: 'Z'
		base: 'z'
		shift, capslock: 'Z'
		ralt: '\u0292'
		ralt+shift, ralt+capslock: '\u01b7'
		ralt: '\u017e'
		ralt+capslock, shift+ralt: '\u017d'
		}

		key X {
		label: 'X'
		base: 'x'
		shift, capslock: 'X'
		ralt: '\u00d7'
		ralt+shift: '\u00b7'
		}

		key C {
		label: 'C'
		base: 'c'
		shift, capslock: 'C'
		ralt: '\u010d'
		ralt+capslock, shift+ralt: '\u010c'
		}

		key V {
		label: 'V'
		base: 'v'
		shift, capslock: 'V'
		ralt: '\u01ef'
		ralt+capslock, shift+ralt: '\u01ee'
		}

		key B {
		label: 'B'
		base: 'b'
		shift, capslock: 'B'
		ralt: '\u0292'
		ralt+capslock, shift+ralt: '\u01b7'
		}

		key N {
		@@ -344,37 +338,30 @@ key N {
		base: 'n'
		shift, capslock: 'N'
		ralt: '\u014b'
		ralt+shift, ralt+capslock: '\u014a'
		ralt+capslock, shift+ralt: '\u014a'
		}

		key M {
		label: 'M'
		base: 'm'
		shift, capslock: 'M'
		ralt: '\u00b5'
		ralt+shift: '\u2014'
		ralt, ralt+capslock: '\u00b5'
		}

		key COMMA {
		label: ','
		base: ','
		shift: ';'
		ralt: '\u2019'
		ralt+shift: '\u2018'
		}

		key PERIOD {
		label: '.'
		base: '.'
		shift: ':'
		ralt: '\u0323'
		ralt+shift: '\u0307'
		}

		key MINUS {
		key SLASH {
		label: '-'
		base: '-'
		shift: '_'
		ralt: '\u2013'
		ralt+shift: '\u0307'
		}

packages/InputDevices/res/raw/keyboard_layout_norwegian.kcm

+42 −6

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

		#
		# Norwegian keyboard layout.
		# Norwegian (EU based + Sami) keyboard layout.
		#

		type OVERLAY

		map key 12 SLASH
		map key 53 MINUS
		map key 86 PLUS

		### ROW 1
		@@ -61,6 +59,7 @@ key 5 {
		label: '5'
		base: '5'
		shift: '%'
		ralt: '\u20ac'
		}

		key 6 {
		@@ -97,7 +96,7 @@ key 0 {
		ralt: '}'
		}

		key SLASH {
		key MINUS {
		label: '+'
		base: '+'
		shift: '?'
		@@ -116,6 +115,8 @@ key Q {
		label: 'Q'
		base: 'q'
		shift, capslock: 'Q'
		ralt: '\u00e2'
		ralt+capslock, shift+ralt: '\u00c2'
		}

		key W {
		@@ -129,6 +130,7 @@ key E {
		base: 'e'
		shift, capslock: 'E'
		ralt: '\u20ac'
		ralt+capslock: '\u20ac'
		}

		key R {
		@@ -141,6 +143,8 @@ key T {
		label: 'T'
		base: 't'
		shift, capslock: 'T'
		ralt: '\u0167'
		ralt+capslock, shift+ralt: '\u0166'
		}

		key Y {
		@@ -159,12 +163,16 @@ key I {
		label: 'I'
		base: 'i'
		shift, capslock: 'I'
		ralt: '\u00ef'
		ralt+capslock, shift+ralt: '\u00cf'
		}

		key O {
		label: 'O'
		base: 'o'
		shift, capslock: 'O'
		ralt: '\u00f5'
		ralt+capslock, shift+ralt: '\u00d5'
		}

		key P {
		@@ -192,36 +200,48 @@ key A {
		label: 'A'
		base: 'a'
		shift, capslock: 'A'
		ralt: '\u00e1'
		ralt+capslock, shift+ralt: '\u00c1'
		}

		key S {
		label: 'S'
		base: 's'
		shift, capslock: 'S'
		ralt: '\u0161'
		ralt+capslock, shift+ralt: '\u0160'
		}

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

		key F {
		label: 'F'
		base: 'f'
		shift, capslock: 'F'
		ralt: '\u01e5'
		ralt+capslock, shift+ralt: '\u01e4'
		}

		key G {
		label: 'G'
		base: 'g'
		shift, capslock: 'G'
		ralt: '\u01e7'
		ralt+capslock, shift+ralt: '\u01e6'
		}

		key H {
		label: 'H'
		base: 'h'
		shift, capslock: 'H'
		ralt: '\u021f'
		ralt+capslock, shift+ralt: '\u021e'
		}

		key J {
		@@ -234,6 +254,8 @@ key K {
		label: 'K'
		base: 'k'
		shift, capslock: 'K'
		ralt: '\u01e9'
		ralt+capslock, shift+ralt: '\u01e8'
		}

		key L {
		@@ -246,12 +268,16 @@ key SEMICOLON {
		label: '\u00d8'
		base: '\u00f8'
		shift, capslock: '\u00d8'
		ralt: '\u00f6'
		ralt+capslock, shift+ralt: '\u00d6'
		}

		key APOSTROPHE {
		label: '\u00c6'
		base: '\u00e6'
		shift, capslock: '\u00c6'
		ralt: '\u00e4'
		ralt+capslock, shift+ralt: '\u00c4'
		}

		key BACKSLASH {
		@@ -272,6 +298,8 @@ key Z {
		label: 'Z'
		base: 'z'
		shift, capslock: 'Z'
		ralt: '\u017e'
		ralt+capslock, shift+ralt: '\u017d'
		}

		key X {
		@@ -284,31 +312,39 @@ key C {
		label: 'C'
		base: 'c'
		shift, capslock: 'C'
		ralt: '\u010d'
		ralt+capslock, shift+ralt: '\u010c'
		}

		key V {
		label: 'V'
		base: 'v'
		shift, capslock: 'V'
		ralt: '\u01ef'
		ralt+capslock, shift+ralt: '\u01ee'
		}

		key B {
		label: 'B'
		base: 'b'
		shift, capslock: 'B'
		ralt: '\u0292'
		ralt+capslock, shift+ralt: '\u01b7'
		}

		key N {
		label: 'N'
		base: 'n'
		shift, capslock: 'N'
		ralt: '\u014b'
		ralt+capslock, shift+ralt: '\u014a'
		}

		key M {
		label: 'M'
		base: 'm'
		shift, capslock: 'M'
		ralt: '\u00b5'
		ralt, ralt+capslock: '\u00b5'
		}

		key COMMA {
		@@ -323,7 +359,7 @@ key PERIOD {
		shift: ':'
		}

		key MINUS {
		key SLASH {
		label: '-'
		base: '-'
		shift: '_'

packages/InputDevices/res/raw/keyboard_layout_swedish.kcm

+42 −6

File changed.

Preview size limit exceeded, changes collapsed.