Use normal font for functional key label instead of italic font

This change also uses slightly larger font size for functional key
label according to the v4 keyboard design.

Bug: 3216592
Change-Id: I027f109b7748ade8564dc808487d9a6ce1da9761
diff --git a/java/res/xml-xlarge/kbd_phone.xml b/java/res/xml-xlarge/kbd_phone.xml
index 4bbd69d..57575b6 100644
--- a/java/res/xml-xlarge/kbd_phone.xml
+++ b/java/res/xml-xlarge/kbd_phone.xml
@@ -30,7 +30,7 @@
         <Key
             latin:codes="@integer/key_tab"
             latin:keyLabel="@string/label_tab_key"
-            latin:keyLabelOption="fontItalic|alignLeft|alignBottom"
+            latin:keyLabelOption="fontNormal|alignLeft|alignBottom"
             latin:isModifier="true"
             latin:keyEdgeFlags="left" />
         <!-- To match one character label size with "Tab", I placed spaces around the char '-'
@@ -61,7 +61,7 @@
         <Key
             latin:codes="@integer/key_delete"
             latin:keyLabel="@string/label_backspace_key"
-            latin:keyLabelOption="fontItalic|alignRight|alignBottom"
+            latin:keyLabelOption="fontNormal|alignRight|alignBottom"
             latin:keyWidth="14.706%p"
             latin:isModifier="true"
             latin:isRepeatable="true"
@@ -71,7 +71,7 @@
         <Key
             latin:codes="@integer/key_switch_alpha_symbol"
             latin:keyLabel="@string/label_more_key"
-            latin:keyLabelOption="fontItalic|alignLeft|alignBottom"
+            latin:keyLabelOption="fontNormal|alignLeft|alignBottom"
             latin:isModifier="true"
             latin:isSticky="true"
             latin:keyEdgeFlags="left" />
@@ -103,7 +103,7 @@
         <Key
             latin:codes="@integer/key_return"
             latin:keyLabel="@string/label_return_key"
-            latin:keyLabelOption="fontItalic|alignRight|alignBottom"
+            latin:keyLabelOption="fontNormal|alignRight|alignBottom"
             latin:keyWidth="14.706%p"
             latin:isModifier="true"
             latin:keyEdgeFlags="right" />
diff --git a/java/res/xml-xlarge/kbd_phone_symbols.xml b/java/res/xml-xlarge/kbd_phone_symbols.xml
index 8f496c0..fea5504 100644
--- a/java/res/xml-xlarge/kbd_phone_symbols.xml
+++ b/java/res/xml-xlarge/kbd_phone_symbols.xml
@@ -30,7 +30,7 @@
         <Key
             latin:codes="@integer/key_tab"
             latin:keyLabel="@string/label_tab_key"
-            latin:keyLabelOption="fontItalic|alignLeft|alignBottom"
+            latin:keyLabelOption="fontNormal|alignLeft|alignBottom"
             latin:isModifier="true"
             latin:keyEdgeFlags="left" />
         <Spacer
@@ -65,7 +65,7 @@
         <Key
             latin:codes="@integer/key_delete"
             latin:keyLabel="@string/label_backspace_key"
-            latin:keyLabelOption="fontItalic|alignRight|alignBottom"
+            latin:keyLabelOption="fontNormal|alignRight|alignBottom"
             latin:keyWidth="14.706%p"
             latin:isModifier="true"
             latin:isRepeatable="true"
@@ -75,7 +75,7 @@
         <Key
             latin:codes="@integer/key_switch_alpha_symbol"
             latin:keyLabel="@string/label_more_key"
-            latin:keyLabelOption="fontItalic|alignLeft|alignBottom"
+            latin:keyLabelOption="fontNormal|alignLeft|alignBottom"
             latin:isModifier="true"
             latin:isSticky="true"
             latin:keyEdgeFlags="left" />
@@ -111,7 +111,7 @@
         <Key
             latin:codes="@integer/key_return"
             latin:keyLabel="@string/label_return_key"
-            latin:keyLabelOption="fontItalic|alignRight|alignBottom"
+            latin:keyLabelOption="fontNormal|alignRight|alignBottom"
             latin:keyWidth="14.706%p"
             latin:isModifier="true"
             latin:keyEdgeFlags="right" />
diff --git a/java/res/xml-xlarge/kbd_qwerty_row1.xml b/java/res/xml-xlarge/kbd_qwerty_row1.xml
index 48e7b32..eca24b6 100644
--- a/java/res/xml-xlarge/kbd_qwerty_row1.xml
+++ b/java/res/xml-xlarge/kbd_qwerty_row1.xml
@@ -28,7 +28,7 @@
         <Key
             latin:codes="@integer/key_tab"
             latin:keyLabel="@string/label_tab_key"
-            latin:keyLabelOption="fontItalic|alignLeft|alignBottom"
+            latin:keyLabelOption="fontNormal|alignLeft|alignBottom"
             latin:keyWidth="7.949%p"
             latin:isModifier="true"
             latin:keyEdgeFlags="left" />
diff --git a/java/res/xml-xlarge/kbd_qwerty_row2.xml b/java/res/xml-xlarge/kbd_qwerty_row2.xml
index f1df3f2..8dfb488 100644
--- a/java/res/xml-xlarge/kbd_qwerty_row2.xml
+++ b/java/res/xml-xlarge/kbd_qwerty_row2.xml
@@ -27,7 +27,7 @@
         <Key
             latin:codes="@integer/key_switch_alpha_symbol"
             latin:keyLabel="@string/label_to_symbol_key"
-            latin:keyLabelOption="fontItalic|alignLeft|alignBottom"
+            latin:keyLabelOption="fontNormal|alignLeft|alignBottom"
             latin:keyWidth="11.167%p"
             latin:isModifier="true"
             latin:keyEdgeFlags="left" />
@@ -62,7 +62,7 @@
         <Key
             latin:codes="@integer/key_return"
             latin:keyLabel="@string/label_return_key"
-            latin:keyLabelOption="fontItalic|alignRight|alignBottom"
+            latin:keyLabelOption="fontNormal|alignRight|alignBottom"
             latin:keyWidth="15.750%p"
             latin:isModifier="true"
             latin:keyEdgeFlags="right" />
diff --git a/java/res/xml-xlarge/kbd_qwerty_row3.xml b/java/res/xml-xlarge/kbd_qwerty_row3.xml
index d58f2c0..c26dcc4 100644
--- a/java/res/xml-xlarge/kbd_qwerty_row3.xml
+++ b/java/res/xml-xlarge/kbd_qwerty_row3.xml
@@ -27,7 +27,7 @@
         <Key
             latin:codes="@integer/key_shift"
             latin:keyLabel="@string/label_shift_key"
-            latin:keyLabelOption="fontItalic|alignLeft|alignBottom"
+            latin:keyLabelOption="fontNormal|alignLeft|alignBottom"
             latin:keyWidth="15.192%p"
             latin:isModifier="true"
             latin:isSticky="true"
@@ -83,7 +83,7 @@
         <Key
             latin:codes="@integer/key_shift"
             latin:keyLabel="@string/label_shift_key"
-            latin:keyLabelOption="fontItalic|alignRight|alignBottom"
+            latin:keyLabelOption="fontNormal|alignRight|alignBottom"
             latin:keyWidth="12.430%p"
             latin:isModifier="true"
             latin:isSticky="true"
diff --git a/java/res/xml-xlarge/kbd_symbols.xml b/java/res/xml-xlarge/kbd_symbols.xml
index 99f4d81..00a61c5 100644
--- a/java/res/xml-xlarge/kbd_symbols.xml
+++ b/java/res/xml-xlarge/kbd_symbols.xml
@@ -31,7 +31,7 @@
         <Key
             latin:codes="@integer/key_tab"
             latin:keyLabel="@string/label_tab_key"
-            latin:keyLabelOption="fontItalic|alignLeft|alignBottom"
+            latin:keyLabelOption="fontNormal|alignLeft|alignBottom"
             latin:keyWidth="7.949%p"
             latin:isModifier="true"
             latin:keyEdgeFlags="left" />
@@ -84,7 +84,7 @@
         <Key
             latin:codes="@integer/key_switch_alpha_symbol"
             latin:keyLabel="@string/label_to_alpha_key"
-            latin:keyLabelOption="fontItalic|alignLeft|alignBottom"
+            latin:keyLabelOption="fontNormal|alignLeft|alignBottom"
             latin:keyWidth="11.167%p"
             latin:isModifier="true"
             latin:keyEdgeFlags="left" />
@@ -123,7 +123,7 @@
         <Key
             latin:codes="@integer/key_return"
             latin:keyLabel="@string/label_return_key"
-            latin:keyLabelOption="fontItalic|alignRight|alignBottom"
+            latin:keyLabelOption="fontNormal|alignRight|alignBottom"
             latin:keyWidth="15.750%p"
             latin:isModifier="true"
             latin:keyEdgeFlags="right" />
@@ -134,7 +134,7 @@
         <Key
             latin:codes="@integer/key_shift"
             latin:keyLabel="@string/label_more_key"
-            latin:keyLabelOption="fontItalic|alignLeft|alignBottom"
+            latin:keyLabelOption="fontNormal|alignLeft|alignBottom"
             latin:keyWidth="15.192%p"
             latin:isModifier="true"
             latin:isSticky="true"
@@ -169,7 +169,7 @@
             latin:codes="@integer/key_shift"
             latin:keyLabel="@string/label_more_key"
             latin:iconPreview="@drawable/sym_keyboard_feedback_shift"
-            latin:keyLabelOption="fontItalic|alignRight|alignBottom"
+            latin:keyLabelOption="fontNormal|alignRight|alignBottom"
             latin:keyWidth="12.430%p"
             latin:isModifier="true"
             latin:isSticky="true"
diff --git a/java/res/xml-xlarge/kbd_symbols_shift.xml b/java/res/xml-xlarge/kbd_symbols_shift.xml
index 016b001..603b36b 100644
--- a/java/res/xml-xlarge/kbd_symbols_shift.xml
+++ b/java/res/xml-xlarge/kbd_symbols_shift.xml
@@ -31,7 +31,7 @@
         <Key
             latin:codes="@integer/key_tab"
             latin:keyLabel="@string/label_tab_key"
-            latin:keyLabelOption="fontItalic|alignLeft|alignBottom"
+            latin:keyLabelOption="fontNormal|alignLeft|alignBottom"
             latin:keyWidth="7.949%p"
             latin:isModifier="true"
             latin:keyEdgeFlags="left" />
@@ -74,7 +74,7 @@
         <Key
             latin:codes="@integer/key_switch_alpha_symbol"
             latin:keyLabel="@string/label_to_alpha_key"
-            latin:keyLabelOption="fontItalic|alignLeft|alignBottom"
+            latin:keyLabelOption="fontNormal|alignLeft|alignBottom"
             latin:keyWidth="11.167%p"
             latin:isModifier="true"
             latin:keyEdgeFlags="left" />
@@ -103,7 +103,7 @@
         <Key
             latin:codes="@integer/key_return"
             latin:keyLabel="@string/label_return_key"
-            latin:keyLabelOption="fontItalic|alignRight|alignBottom"
+            latin:keyLabelOption="fontNormal|alignRight|alignBottom"
             latin:keyWidth="15.750%p"
             latin:isModifier="true"
             latin:keyEdgeFlags="right" />
@@ -114,7 +114,7 @@
         <Key
             latin:codes="@integer/key_shift"
             latin:keyLabel="@string/label_more_key"
-            latin:keyLabelOption="fontItalic|alignLeft|alignBottom"
+            latin:keyLabelOption="fontNormal|alignLeft|alignBottom"
             latin:keyWidth="15.192%p"
             latin:isModifier="true"
             latin:isSticky="true"
@@ -144,7 +144,7 @@
         <Key
             latin:codes="@integer/key_shift"
             latin:keyLabel="@string/label_more_key"
-            latin:keyLabelOption="fontItalic|alignRight|alignBottom"
+            latin:keyLabelOption="fontNormal|alignRight|alignBottom"
             latin:keyWidth="12.430%p"
             latin:isModifier="true"
             latin:isSticky="true"