Support shift when capslock in Romanian and Serbian

The KCM layouts for Romanian and Serbian have been recently added,
but using shift while capslock is activated won't produce
lowercase characters. This CL addresses that.

Bug: 299861742
Test: Flashed on device, tested with physical keyboard
Flag: EXEMPT resource only update
Change-Id: I748c775b8b1d3991b924ac577f6b58e54427ed9e

3 files changed, 188 insertions, 95 deletions

diff --git a/packages/InputDevices/res/raw/keyboard_layout_romanian.kcm b/packages/InputDevices/res/raw/keyboard_layout_romanian.kcm
index b384a2418ff2..b0308b5dccd4 100644
--- a/packages/InputDevices/res/raw/keyboard_layout_romanian.kcm
+++ b/packages/InputDevices/res/raw/keyboard_layout_romanian.kcm
@@ -120,78 +120,90 @@ key EQUALS {
 
 key Q {
     label:                              'Q'
-    base, capslock+shift:               'q'
+    base:                               'q'
     shift, capslock:                    'Q'
+    shift+capslock:                     'q'
 }
 
 key W {
     label:                              'W'
-    base, capslock+shift:               'w'
+    base:                               'w'
     shift, capslock:                    'W'
+    shift+capslock:                     'w'
 }
 
 key E {
     label:                              'E'
-    base, capslock+shift:               'e'
+    base:                               'e'
     shift, capslock:                    'E'
+    shift+capslock:                     'e'
     ralt:                               '\u20ac'
 }
 
 key R {
     label:                              'R'
-    base, capslock+shift:               'r'
+    base:                               'r'
     shift, capslock:                    'R'
+    shift+capslock:                     'r'
 }
 
 key T {
     label:                              'T'
-    base, capslock+shift:               't'
+    base:                               't'
     shift, capslock:                    'T'
+    shift+capslock:                     't'
 }
 
 key Y {
     label:                              'Y'
-    base, capslock+shift:               'y'
+    base:                               'y'
     shift, capslock:                    'Y'
+    shift+capslock:                     'y'
 }
 
 key U {
     label:                              'U'
-    base, capslock+shift:               'u'
+    base:                               'u'
     shift, capslock:                    'U'
+    shift+capslock:                     'u'
 }
 
 key I {
     label:                              'I'
-    base, capslock+shift:               'i'
+    base:                               'i'
     shift, capslock:                    'I'
+    shift+capslock:                     'i'
 }
 
 key O {
     label:                              'O'
-    base, capslock+shift:               'o'
+    base:                               'o'
     shift, capslock:                    'O'
+    shift+capslock:                     'o'
 }
 
 key P {
     label:                              'P'
-    base, capslock+shift:               'p'
+    base:                               'p'
     shift, capslock:                    'P'
+    shift+capslock:                     'p'
     ralt:                               '\u00a7'
 }
 
 key LEFT_BRACKET {
     label:                              '\u0102'
-    base, capslock+shift:               '\u0103'
+    base:                               '\u0103'
     shift, capslock:                    '\u0102'
+    shift+capslock:                     '\u0103'
     ralt:                               '['
     ralt+shift:                         '{'
 }
 
 key RIGHT_BRACKET {
     label:                              '\u00ce'
-    base, capslock+shift:               '\u00ee'
+    base:                               '\u00ee'
     shift, capslock:                    '\u00ce'
+    shift+capslock:                     '\u00ee'
     ralt:                               ']'
     ralt+shift:                         '}'
 }
@@ -200,21 +212,24 @@ key RIGHT_BRACKET {
 
 key A {
     label:                              'A'
-    base, capslock+shift:               'a'
+    base:                               'a'
     shift, capslock:                    'A'
+    shift+capslock:                     'a'
 }
 
 key S {
     label:                              'S'
-    base, capslock+shift:               's'
+    base:                               's'
     shift, capslock:                    'S'
+    shift+capslock:                     's'
     ralt:                               '\u00df'
 }
 
 key D {
     label:                              'D'
-    base, capslock+shift:               'd'
+    base:                               'd'
     shift, capslock:                    'D'
+    shift+capslock:                     'd'
     ralt:                               '\u0111'
     ralt+shift, ralt+capslock:          '\u0110'
     ralt+shift+capslock:                '\u0111'
@@ -222,38 +237,44 @@ key D {
 
 key F {
     label:                              'F'
-    base, capslock+shift:               'f'
+    base:                               'f'
     shift, capslock:                    'F'
+    shift+capslock:                     'f'
 }
 
 key G {
     label:                              'G'
-    base, capslock+shift:               'g'
+    base:                               'g'
     shift, capslock:                    'G'
+    shift+capslock:                     'g'
 }
 
 key H {
     label:                              'H'
-    base, capslock+shift:               'h'
+    base:                               'h'
     shift, capslock:                    'H'
+    shift+capslock:                     'h'
 }
 
 key J {
     label:                              'J'
-    base, capslock+shift:               'j'
+    base:                               'j'
     shift, capslock:                    'J'
+    shift+capslock:                     'j'
 }
 
 key K {
     label:                              'K'
-    base, capslock+shift:               'k'
+    base:                               'k'
     shift, capslock:                    'K'
+    shift+capslock:                     'k'
 }
 
 key L {
     label:                              'L'
-    base, capslock+shift:               'l'
+    base:                               'l'
     shift, capslock:                    'L'
+    shift+capslock:                     'l'
     ralt:                               '\u0142'
     ralt+shift, ralt+capslock:          '\u0141'
     ralt+shift+capslock:                '\u0142'
@@ -261,24 +282,27 @@ key L {
 
 key SEMICOLON {
     label:                              '\u0218'
-    base, capslock+shift:               '\u0219'
+    base:                               '\u0219'
     shift, capslock:                    '\u0218'
+    shift+capslock:                     '\u0219'
     ralt:                               ';'
     ralt+shift:                         ':'
 }
 
 key APOSTROPHE {
     label:                              '\u021a'
-    base, capslock+shift:               '\u021b'
+    base:                               '\u021b'
     shift, capslock:                    '\u021a'
+    shift+capslock:                     '\u021b'
     ralt:                               '\''
     ralt+shift:                         '\u0022'
 }
 
 key BACKSLASH {
     label:                              '\u00c2'
-    base, capslock+shift:               '\u00e2'
+    base:                               '\u00e2'
     shift, capslock:                    '\u00c2'
+    shift+capslock:                     '\u00e2'
     ralt:                               '\\'
     ralt+shift:                         '|'
 }
@@ -293,45 +317,52 @@ key PLUS {
 
 key Z {
     label:                              'Z'
-    base, capslock+shift:               'z'
+    base:                               'z'
     shift, capslock:                    'Z'
+    shift+capslock:                     'z'
 }
 
 key X {
     label:                              'X'
-    base, capslock+shift:               'x'
+    base:                               'x'
     shift, capslock:                    'X'
+    shift+capslock:                     'x'
 }
 
 key C {
     label:                              'C'
-    base, capslock+shift:               'c'
+    base:                               'c'
     shift, capslock:                    'C'
+    shift+capslock:                     'c'
     ralt:                               '\u00a9'
 }
 
 key V {
     label:                              'V'
-    base, capslock+shift:               'v'
+    base:                               'v'
     shift, capslock:                    'V'
+    shift+capslock:                     'v'
 }
 
 key B {
     label:                              'B'
-    base, capslock+shift:               'b'
+    base:                               'b'
     shift, capslock:                    'B'
+    shift+capslock:                     'b'
 }
 
 key N {
     label:                              'N'
-    base, capslock+shift:               'n'
+    base:                               'n'
     shift, capslock:                    'N'
+    shift+capslock:                     'n'
 }
 
 key M {
     label:                              'M'
-    base, capslock+shift:               'm'
+    base:                               'm'
     shift, capslock:                    'M'
+    shift+capslock:                     'm'
 }
 
 key COMMA {
diff --git a/packages/InputDevices/res/raw/keyboard_layout_serbian_and_montenegrin_cyrillic.kcm b/packages/InputDevices/res/raw/keyboard_layout_serbian_and_montenegrin_cyrillic.kcm
index 6fa54f9d052f..9df78c9af923 100644
--- a/packages/InputDevices/res/raw/keyboard_layout_serbian_and_montenegrin_cyrillic.kcm
+++ b/packages/InputDevices/res/raw/keyboard_layout_serbian_and_montenegrin_cyrillic.kcm
@@ -104,149 +104,173 @@ key EQUALS {
 
 key Q {
     label:                              '\u0409'
-    base, capslock+shift:               '\u0459'
+    base:                               '\u0459'
     shift, capslock:                    '\u0409'
+    shift+capslock:                     '\u0459'
 }
 
 key W {
     label:                              '\u040a'
-    base, capslock+shift:               '\u045a'
+    base:                               '\u045a'
     shift, capslock:                    '\u040a'
+    shift+capslock:                     '\u045a'
 }
 
 key E {
     label:                              '\u0415'
-    base, capslock+shift:               '\u0435'
+    base:                               '\u0435'
     shift, capslock:                    '\u0415'
+    shift+capslock:                     '\u0435'
     ralt:                               '\u20ac'
 }
 
 key R {
     label:                              '\u0420'
-    base, capslock+shift:               '\u0440'
+    base:                               '\u0440'
     shift, capslock:                    '\u0420'
+    shift+capslock:                     '\u0440'
 }
 
 key T {
     label:                              '\u0422'
-    base, capslock+shift:               '\u0442'
+    base:                               '\u0442'
     shift, capslock:                    '\u0422'
+    shift+capslock:                     '\u0442'
 }
 
 key Y {
     label:                              '\u0417'
-    base, capslock+shift:               '\u0437'
+    base:                               '\u0437'
     shift, capslock:                    '\u0417'
+    shift+capslock:                     '\u0437'
 }
 
 key U {
     label:                              '\u0423'
-    base, capslock+shift:               '\u0443'
+    base:                               '\u0443'
     shift, capslock:                    '\u0423'
+    shift+capslock:                     '\u0443'
 }
 
 key I {
     label:                              '\u0418'
-    base, capslock+shift:               '\u0438'
+    base:                               '\u0438'
     shift, capslock:                    '\u0418'
+    shift+capslock:                     '\u0438'
 }
 
 key O {
     label:                              '\u041e'
-    base, capslock+shift:               '\u043e'
+    base:                               '\u043e'
     shift, capslock:                    '\u041e'
+    shift+capslock:                     '\u043e'
 }
 
 key P {
     label:                              '\u041f'
-    base, capslock+shift:               '\u043f'
+    base:                               '\u043f'
     shift, capslock:                    '\u041f'
+    shift+capslock:                     '\u043f'
 }
 
 key LEFT_BRACKET {
     label:                              '\u0428'
-    base, capslock+shift:               '\u0448'
+    base:                               '\u0448'
     shift, capslock:                    '\u0428'
+    shift+capslock:                     '\u0448'
 }
 
 key RIGHT_BRACKET {
     label:                              '\u0402'
-    base, capslock+shift:               '\u0452'
+    base:                               '\u0452'
     shift, capslock:                    '\u0402'
+    shift+capslock:                     '\u0452'
 }
 
 ### ROW 3
 
 key A {
     label:                              '\u0410'
-    base, capslock+shift:               '\u0430'
+    base:                               '\u0430'
     shift, capslock:                    '\u0410'
+    shift+capslock:                     '\u0430'
 }
 
 key S {
     label:                              '\u0421'
-    base, capslock+shift:               '\u0441'
+    base:                               '\u0441'
     shift, capslock:                    '\u0421'
+    shift+capslock:                     '\u0441'
 }
 
 key D {
     label:                              '\u0414'
-    base, capslock+shift:               '\u0434'
+    base:                               '\u0434'
     shift, capslock:                    '\u0414'
+    shift+capslock:                     '\u0434'
 }
 
 key F {
     label:                              '\u0424'
-    base, capslock+shift:               '\u0444'
+    base:                               '\u0444'
     shift, capslock:                    '\u0424'
+    shift+capslock:                     '\u0444'
 }
 
 key G {
     label:                              '\u0413'
-    base, capslock+shift:               '\u0433'
+    base:                               '\u0433'
     shift, capslock:                    '\u0413'
+    shift+capslock:                     '\u0433'
 }
 
 key H {
     label:                              '\u0425'
-    base, capslock+shift:               '\u0445'
+    base:                               '\u0445'
     shift, capslock:                    '\u0425'
+    shift+capslock:                     '\u0445'
 }
 
 key J {
     label:                              '\u0408'
-    base, capslock+shift:               '\u0458'
+    base:                               '\u0458'
     shift, capslock:                    '\u0408'
+    shift+capslock:                     '\u0458'
 }
 
 key K {
     label:                              '\u041a'
-    base, capslock+shift:               '\u043a'
+    base:                               '\u043a'
     shift, capslock:                    '\u041a'
+    shift+capslock:                     '\u043a'
 }
 
 key L {
     label:                              '\u041b'
-    base, capslock+shift:               '\u043b'
+    base:                               '\u043b'
     shift, capslock:                    '\u041b'
+    shift+capslock:                     '\u043b'
 }
 
 key SEMICOLON {
     label:                              '\u0427'
-    base, capslock+shift:               '\u0447'
+    base:                               '\u0447'
     shift, capslock:                    '\u0427'
+    shift+capslock:                     '\u0447'
 }
 
 key APOSTROPHE {
     label:                              '\u040b'
-    base, capslock+shift:               '\u045b'
+    base:                               '\u045b'
     shift, capslock:                    '\u040b'
+    shift+capslock:                     '\u045b'
 }
 
 key BACKSLASH {
     label:                              '\u0416'
-    base, capslock+shift:               '\u0436'
+    base:                               '\u0436'
     shift, capslock:                    '\u0416'
+    shift+capslock:                     '\u0436'
 }
 
 ### ROW 4
@@ -259,44 +283,51 @@ key PLUS {
 
 key Z {
     label:                              '\u0405'
-    base, capslock+shift:               '\u0455'
+    base:                               '\u0455'
     shift, capslock:                    '\u0405'
+    shift+capslock:                     '\u0455'
 }
 
 key X {
     label:                              '\u040f'
-    base, capslock+shift:               '\u045f'
+    base:                               '\u045f'
     shift, capslock:                    '\u040f'
+    shift+capslock:                     '\u045f'
 }
 
 key C {
     label:                              '\u0426'
-    base, capslock+shift:               '\u0446'
+    base:                               '\u0446'
     shift, capslock:                    '\u0426'
+    shift+capslock:                     '\u0446'
 }
 
 key V {
     label:                              '\u0412'
-    base, capslock+shift:               '\u0432'
+    base:                               '\u0432'
     shift, capslock:                    '\u0412'
+    shift+capslock:                     '\u0432'
 }
 
 key B {
     label:                              '\u0411'
-    base, capslock+shift:               '\u0431'
+    base:                               '\u0431'
     shift, capslock:                    '\u0411'
+    shift+capslock:                     '\u0431'
 }
 
 key N {
     label:                              '\u041d'
-    base, capslock+shift:               '\u043d'
+    base:                               '\u043d'
     shift, capslock:                    '\u041d'
+    shift+capslock:                     '\u043d'
 }
 
 key M {
     label:                              '\u041c'
-    base, capslock+shift:               '\u043c'
+    base:                               '\u043c'
     shift, capslock:                    '\u041c'
+    shift+capslock:                     '\u043c'
 }
 
 key COMMA {
@@ -317,4 +348,4 @@ key SLASH {
     label:                              '-'
     base:                               '-'
     shift:                              '_'
-}
\ No newline at end of file
+}
diff --git a/packages/InputDevices/res/raw/keyboard_layout_serbian_and_montenegrin_latin.kcm b/packages/InputDevices/res/raw/keyboard_layout_serbian_and_montenegrin_latin.kcm
index 8e4d7b147faa..4c8997b16a26 100644
--- a/packages/InputDevices/res/raw/keyboard_layout_serbian_and_montenegrin_latin.kcm
+++ b/packages/InputDevices/res/raw/keyboard_layout_serbian_and_montenegrin_latin.kcm
@@ -120,78 +120,90 @@ key EQUALS {
 
 key Q {
     label:                              'Q'
-    base, capslock+shift:               'q'
+    base:                               'q'
     shift, capslock:                    'Q'
+    shift+capslock:                     'q'
     ralt:                               '\\'
 }
 
 key W {
     label:                              'W'
-    base, capslock+shift:               'w'
+    base:                               'w'
     shift, capslock:                    'W'
+    shift+capslock:                     'w'
     ralt:                               '|'
 }
 
 key E {
     label:                              'E'
-    base, capslock+shift:               'e'
+    base:                               'e'
     shift, capslock:                    'E'
+    shift+capslock:                     'e'
     ralt:                               '\u20ac'
 }
 
 key R {
     label:                              'R'
-    base, capslock+shift:               'r'
+    base:                               'r'
     shift, capslock:                    'R'
+    shift+capslock:                     'r'
 }
 
 key T {
     label:                              'T'
-    base, capslock+shift:               't'
+    base:                               't'
     shift, capslock:                    'T'
+    shift+capslock:                     't'
 }
 
 key Z {
     label:                              'Z'
-    base, capslock+shift:               'z'
+    base:                               'z'
     shift, capslock:                    'Z'
+    shift+capslock:                     'z'
 }
 
 key U {
     label:                              'U'
-    base, capslock+shift:               'u'
+    base:                               'u'
     shift, capslock:                    'U'
+    shift+capslock:                     'u'
 }
 
 key I {
     label:                              'I'
-    base, capslock+shift:               'i'
+    base:                               'i'
     shift, capslock:                    'I'
+    shift+capslock:                     'i'
 }
 
 key O {
     label:                              'O'
-    base, capslock+shift:               'o'
+    base:                               'o'
     shift, capslock:                    'O'
+    shift+capslock:                     'o'
 }
 
 key P {
     label:                              'P'
-    base, capslock+shift:               'p'
+    base:                               'p'
     shift, capslock:                    'P'
+    shift+capslock:                     'p'
 }
 
 key LEFT_BRACKET {
     label:                              '\u0160'
-    base, capslock+shift:               '\u0161'
+    base:                               '\u0161'
     shift, capslock:                    '\u0160'
+    shift+capslock:                     '\u0161'
     ralt:                               '\u00f7'
 }
 
 key RIGHT_BRACKET {
     label:                              '\u0110'
-    base, capslock+shift:               '\u0111'
+    base:                               '\u0111'
     shift, capslock:                    '\u0110'
+    shift+capslock:                     '\u0111'
     ralt:                               '\u00d7'
 }
 
@@ -199,79 +211,91 @@ key RIGHT_BRACKET {
 
 key A {
     label:                              'A'
-    base, capslock+shift:               'a'
+    base:                               'a'
     shift, capslock:                    'A'
+    shift+capslock:                     'a'
 }
 
 key S {
     label:                              'S'
-    base, capslock+shift:               's'
+    base:                               's'
     shift, capslock:                    'S'
+    shift+capslock:                     's'
 }
 
 key D {
     label:                              'D'
-    base, capslock+shift:               'd'
+    base:                               'd'
     shift, capslock:                    'D'
+    shift+capslock:                     'd'
 }
 
 key F {
     label:                              'F'
-    base, capslock+shift:               'f'
+    base:                               'f'
     shift, capslock:                    'F'
+    shift+capslock:                     'f'
     ralt:                               '['
 }
 
 key G {
     label:                              'G'
-    base, capslock+shift:               'g'
+    base:                               'g'
     shift, capslock:                    'G'
+    shift+capslock:                     'g'
     ralt:                               ']'
 }
 
 key H {
     label:                              'H'
-    base, capslock+shift:               'h'
+    base:                               'h'
     shift, capslock:                    'H'
+    shift+capslock:                     'h'
 }
 
 key J {
     label:                              'J'
-    base, capslock+shift:               'j'
+    base:                               'j'
     shift, capslock:                    'J'
+    shift+capslock:                     'j'
 }
 
 key K {
     label:                              'K'
-    base, capslock+shift:               'k'
+    base:                               'k'
     shift, capslock:                    'K'
+    shift+capslock:                     'k'
     ralt:                               '\u0142'
 }
 
 key L {
     label:                              'L'
-    base, capslock+shift:               'l'
+    base:                               'l'
     shift, capslock:                    'L'
+    shift+capslock:                     'l'
     ralt:                               '\u0141'
 }
 
 key SEMICOLON {
     label:                              '\u010c'
-    base, capslock+shift:               '\u010d'
+    base:                               '\u010d'
     shift, capslock:                    '\u010c'
+    shift+capslock:                     '\u010d'
 }
 
 key APOSTROPHE {
     label:                              '\u0106'
-    base, capslock+shift:               '\u0107'
+    base:                               '\u0107'
     shift, capslock:                    '\u0106'
+    shift+capslock:                     '\u0107'
     ralt:                               '\u00df'
 }
 
 key BACKSLASH {
     label:                              '\u017d'
-    base, capslock+shift:               '\u017e'
+    base:                               '\u017e'
     shift, capslock:                    '\u017d'
+    shift+capslock:                     '\u017e'
     ralt:                               '\u00a4'
 }
 
@@ -285,47 +309,54 @@ key PLUS {
 
 key Y {
     label:                              'Y'
-    base, capslock+shift:               'y'
+    base:                               'y'
     shift, capslock:                    'Y'
+    shift+capslock:                     'y'
 }
 
 key X {
     label:                              'X'
-    base, capslock+shift:               'x'
+    base:                               'x'
     shift, capslock:                    'X'
+    shift+capslock:                     'x'
 }
 
 key C {
     label:                              'C'
-    base, capslock+shift:               'c'
+    base:                               'c'
     shift, capslock:                    'C'
+    shift+capslock:                     'c'
 }
 
 key V {
     label:                              'V'
-    base, capslock+shift:               'v'
+    base:                               'v'
     shift, capslock:                    'V'
+    shift+capslock:                     'v'
     ralt:                               '@'
 }
 
 key B {
     label:                              'B'
-    base, capslock+shift:               'b'
+    base:                               'b'
     shift, capslock:                    'B'
+    shift+capslock:                     'b'
     ralt:                               '{'
 }
 
 key N {
     label:                              'N'
-    base, capslock+shift:               'n'
+    base:                               'n'
     shift, capslock:                    'N'
+    shift+capslock:                     'n'
     ralt:                               '}'
 }
 
 key M {
     label:                              'M'
-    base, capslock+shift:               'm'
+    base:                               'm'
     shift, capslock:                    'M'
+    shift+capslock:                     'm'
     ralt:                               '\u00a7'
 }
 
@@ -347,4 +378,4 @@ key MINUS {
     label:                              '-'
     base:                               '-'
     shift:                              '_'
-}
\ No newline at end of file
+}