Merge "Bring "comma" key back to symbol layout"

java/res/xml/kbd_key_styles.xml

@@ -227,6 +227,14 @@
                 latin:parentStyle="functionalKeyStyle" />
         </default>
     </switch>
+    <key-style
+        latin:styleName="basePunctuationKeyStyle"
+        latin:keyLabel="."
+        latin:keyHintLabel="@string/keyhintlabel_for_punctuation"
+        latin:keyLabelOption="hasPopupHint"
+        latin:popupCharacters="@string/alternates_for_punctuation"
+        latin:maxPopupKeyboardColumn="@integer/popup_keyboard_column_for_punctuation"
+        latin:parentStyle="functionalKeyStyle" />
     <switch>
         <case
             latin:navigateAction="true"
@@ -242,12 +250,7 @@
         <default>
             <key-style
                 latin:styleName="punctuationKeyStyle"
-                latin:keyLabel="."
-                latin:keyHintLabel="@string/keyhintlabel_for_punctuation"
-                latin:keyLabelOption="hasPopupHint"
-                latin:popupCharacters="@string/alternates_for_punctuation"
-                latin:maxPopupKeyboardColumn="@integer/popup_keyboard_column_for_punctuation"
-                latin:parentStyle="functionalKeyStyle" />
+                latin:parentStyle="basePunctuationKeyStyle" />
         </default>
     </switch>
 </merge>

java/res/xml/kbd_symbols_row4.xml

@@ -42,7 +42,7 @@
                     latin:keyStyle="spaceKeyStyle"
                     latin:keyWidth="35.83%p" />
                 <Key
-                    latin:keyStyle="punctuationKeyStyle"
+                    latin:keyStyle="basePunctuationKeyStyle"
                     latin:keyWidth="9.2%p" />
             </case>
             <!-- latin:hasSettingsKey="false" -->
@@ -57,7 +57,7 @@
                     latin:keyStyle="spaceKeyStyle"
                     latin:keyWidth="50%p" />
                 <Key
-                    latin:keyStyle="punctuationKeyStyle" />
+                    latin:keyStyle="basePunctuationKeyStyle" />
             </default>
         </switch>
         <switch>