Optimize layout

Bug: 9059539

Change-Id: Iabfd44daae1ef6da99a864859488a4f644240925
diff --git a/java/res/xml/row_symbols4.xml b/java/res/xml/row_symbols4.xml
index 96e550c..91d244a 100644
--- a/java/res/xml/row_symbols4.xml
+++ b/java/res/xml/row_symbols4.xml
@@ -27,6 +27,12 @@
         <Key
             latin:keyStyle="toAlphaKeyStyle"
             latin:keyWidth="15%p" />
+        <Key
+            latin:keyLabel="_"
+            latin:backgroundType="functional" />
+        <Key
+            latin:keyLabel="/"
+            latin:backgroundType="functional" />
         <switch>
             <case
                 latin:hasShortcutKey="true"
@@ -36,18 +42,13 @@
             </case>
             <!-- latin:hasShortcutKey="false" -->
             <default>
-                <Key
-                    latin:keyLabel="!text/keylabel_for_comma"
-                    latin:keyLabelFlags="hasPopupHint"
-                    latin:additionalMoreKeys="!text/more_keys_for_comma"
-                    latin:keyStyle="f1MoreKeysStyle" />
             </default>
         </switch>
         <include
-            latin:keyXPos="25%p"
-            latin:keyboardLayout="@xml/key_space" />
-        <Key
-            latin:keyStyle="punctuationKeyStyle" />
+            latin:keyXPos="35%p"
+            latin:keyboardLayout="@xml/key_space_30" />
+        <include
+            latin:keyboardLayout="@xml/keys_comma_period" />
         <Key
             latin:keyStyle="emojiKeyStyle"
             latin:keyWidth="fillRight" />