Fix popup mini keyboard of comma key on symbols layout

Bug: 5058762
Change-Id: Ic2d48358b0aceb1d55b3e12bb32b4423ff41ccf3

java/res/values-ar/donottranslate-altchars.xml

@@ -56,11 +56,14 @@
     <string name="alternates_for_symbols_9">9</string>
     <string name="alternates_for_symbols_0">0,ⁿ,∅</string>
     <string name="keylabel_for_symbols_comma">\u060c</string>
+    <string name="keylabel_for_symbols_f1">\u060c</string>
     <string name="keylabel_for_symbols_question">\u061f</string>
     <string name="keylabel_for_symbols_semicolon">\u061b</string>
     <!-- \u066a: ARABIC PERCENT SIGN -->
     <string name="keylabel_for_symbols_percent">\u066a</string>
     <string name="alternates_for_symbols_comma">,</string>
+    <!-- @icon/5 is iconsSettingsKey -->
+    <string name="alternates_for_symbols_f1">"\\,,\@icon/5|\@integer/key_settings"</string>
     <string name="alternates_for_symbols_question">\?,¿</string>
     <string name="alternates_for_symbols_semicolon">;</string>
     <string name="alternates_for_symbols_percent">%,‰</string>

java/res/values/donottranslate-altchars.xml

@@ -78,10 +78,13 @@
     <string name="alternates_for_symbols_9"></string>
     <string name="alternates_for_symbols_0">ⁿ,∅</string>
     <string name="keylabel_for_symbols_comma">,</string>
+    <string name="keylabel_for_symbols_f1">,</string>
     <string name="keylabel_for_symbols_question">\?</string>
     <string name="keylabel_for_symbols_semicolon">;</string>
     <string name="keylabel_for_symbols_percent">%</string>
     <string name="alternates_for_symbols_comma"></string>
+    <!-- @icon/5 is iconsSettingsKey -->
+    <string name="alternates_for_symbols_f1">\@icon/5|\@integer/key_settings</string>
     <string name="alternates_for_symbols_question">¿</string>
     <string name="alternates_for_symbols_semicolon"></string>
     <string name="alternates_for_symbols_percent">‰</string>

java/res/xml/kbd_key_styles.xml

@@ -33,6 +33,9 @@
             <key-style
                 latin:styleName="settingsPopupStyle"
                 latin:parentStyle="functionalKeyStyle" />
+            <key-style
+                latin:styleName="symbolsF1PopupStyle"
+                latin:parentStyle="functionalKeyStyle" />
         </case>
         <case
             latin:clobberSettingsKey="false"
@@ -41,6 +44,9 @@
             <key-style
                 latin:styleName="settingsPopupStyle"
                 latin:parentStyle="functionalKeyStyle" />
+            <key-style
+                latin:styleName="symbolsF1PopupStyle"
+                latin:parentStyle="functionalKeyStyle" />
         </case>
         <!-- clobberSettingsKey="false" and hasSettingsKey="false" -->
         <default>
@@ -49,6 +55,11 @@
                 latin:keyLabelOption="hasPopupHint"
                 latin:popupCharacters="\@icon/5|\@integer/key_settings"
                 latin:parentStyle="functionalKeyStyle" />
+            <key-style
+                latin:styleName="symbolsF1PopupStyle"
+                latin:keyLabelOption="hasPopupHint"
+                latin:popupCharacters="@string/alternates_for_symbols_f1"
+                latin:parentStyle="functionalKeyStyle" />
         </default>
     </switch>
     <!-- Functional key styles -->

java/res/xml/kbd_symbols_f1.xml

@@ -36,10 +36,9 @@
                 <!-- latin:hasVoiceKey="false" -->
                 <default>
                     <Key
-                        latin:keyLabel="@string/keylabel_for_symbols_comma"
+                        latin:keyLabel="@string/keylabel_for_symbols_f1"
-                        latin:popupCharacters="@string/alternates_for_symbols_comma"
                         latin:keyWidth="9.2%p"
-                        latin:keyStyle="settingsPopupStyle" />
+                        latin:keyStyle="symbolsF1PopupStyle" />
                 </default>
             </switch>
         </case>
@@ -55,9 +54,8 @@
                 <!-- latin:hasVoiceKey="false" -->
                 <default>
                     <Key
-                        latin:keyLabel="@string/keylabel_for_symbols_comma"
+                        latin:keyLabel="@string/keylabel_for_symbols_f1"
-                        latin:popupCharacters="@string/alternates_for_symbols_comma"
+                        latin:keyStyle="symbolsF1PopupStyle" />
-                        latin:keyStyle="settingsPopupStyle" />
                 </default>
             </switch>
         </default>