Rename key label and alternates string resource names

Bug: 4340933
Change-Id: I7c80c0b6a8a9082c52b57a858e2b6740c05366ec

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

@@ -55,15 +55,15 @@
     <string name="alternates_for_symbols_8">8</string>
     <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_comma">\u060c</string>
-    <string name="keylabel_for_symbols_f1">\u060c</string>
+    <string name="keylabel_for_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>
+    <string name="alternates_for_comma">,</string>
     <!-- @icon/5 is iconsSettingsKey -->
-    <string name="alternates_for_symbols_f1">"\\,,\@icon/5|\@integer/key_settings"</string>
+    <string name="alternates_for_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

@@ -77,14 +77,14 @@
     <string name="alternates_for_symbols_8"></string>
     <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_comma">,</string>
-    <string name="keylabel_for_symbols_f1">,</string>
+    <string name="keylabel_for_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>
+    <string name="alternates_for_comma"></string>
     <!-- @icon/5 is iconsSettingsKey -->
-    <string name="alternates_for_symbols_f1">\@icon/5|\@integer/key_settings</string>
+    <string name="alternates_for_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-sw600dp/kbd_rows_symbols.xml

@@ -128,8 +128,8 @@
             latin:keyLabel="@string/keylabel_for_symbols_semicolon"
             latin:popupCharacters="@string/alternates_for_symbols_semicolon" />
         <Key
-            latin:keyLabel="@string/keylabel_for_symbols_comma"
+            latin:keyLabel="@string/keylabel_for_comma"
-            latin:popupCharacters="@string/alternates_for_symbols_comma" />
+            latin:popupCharacters="@string/alternates_for_comma" />
         <Key
             latin:keyLabel="." />
         <Key

java/res/xml-sw768dp/kbd_rows_symbols.xml

@@ -135,8 +135,8 @@
             latin:keyLabel="@string/keylabel_for_symbols_semicolon"
             latin:popupCharacters="@string/alternates_for_symbols_semicolon" />
         <Key
-            latin:keyLabel="@string/keylabel_for_symbols_comma"
+            latin:keyLabel="@string/keylabel_for_comma"
-            latin:popupCharacters="@string/alternates_for_symbols_comma" />
+            latin:popupCharacters="@string/alternates_for_comma" />
         <Key
             latin:keyLabel="." />
         <Key

java/res/xml/kbd_key_styles.xml

@@ -58,7 +58,7 @@
             <key-style
                 latin:styleName="symbolsF1PopupStyle"
                 latin:keyLabelOption="hasPopupHint"
-                latin:popupCharacters="@string/alternates_for_symbols_f1"
+                latin:popupCharacters="@string/alternates_for_f1"
                 latin:parentStyle="functionalKeyStyle" />
         </default>
     </switch>

java/res/xml/kbd_qwerty_f1.xml

@@ -62,7 +62,7 @@
                         </case>
                         <default>
                             <Key
-                                latin:keyLabel="@string/keylabel_for_symbols_comma"
+                                latin:keyLabel="@string/keylabel_for_comma"
                                 latin:keyWidth="9.2%p"
                                 latin:keyStyle="settingsPopupStyle" />
                         </default>
@@ -105,7 +105,7 @@
                         </case>
                         <default>
                             <Key
-                                latin:keyLabel="@string/keylabel_for_symbols_comma"
+                                latin:keyLabel="@string/keylabel_for_comma"
                                 latin:keyStyle="settingsPopupStyle" />
                         </default>
                     </switch>

java/res/xml/kbd_symbols_f1.xml

@@ -36,7 +36,7 @@
                 <!-- latin:hasShortcutKey="false" -->
                 <default>
                     <Key
-                        latin:keyLabel="@string/keylabel_for_symbols_f1"
+                        latin:keyLabel="@string/keylabel_for_f1"
                         latin:keyWidth="9.2%p"
                         latin:keyStyle="symbolsF1PopupStyle" />
                 </default>
@@ -54,7 +54,7 @@
                 <!-- latin:hasShortcutKey="false" -->
                 <default>
                     <Key
-                        latin:keyLabel="@string/keylabel_for_symbols_f1"
+                        latin:keyLabel="@string/keylabel_for_f1"
                         latin:keyStyle="symbolsF1PopupStyle" />
                 </default>
             </switch>