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

1 files changed, 3 insertions, 6 deletions

diff --git a/java/src/com/android/inputmethod/latin/BaseKeyboardView.java b/java/src/com/android/inputmethod/latin/BaseKeyboardView.java
index 8efd0ae9a..d98cd04b2 100644
--- a/java/src/com/android/inputmethod/latin/BaseKeyboardView.java
+++ b/java/src/com/android/inputmethod/latin/BaseKeyboardView.java
@@ -259,10 +259,7 @@ public class BaseKeyboardView extends View implements PointerTracker.UIProxy {
     private final int KEY_LABEL_OPTION_ALIGN_LEFT = 1;
     private final int KEY_LABEL_OPTION_ALIGN_RIGHT = 2;
     private final int KEY_LABEL_OPTION_ALIGN_BOTTOM = 8;
-    private final int KEY_LABEL_OPTION_FONT_ITALIC = 16;
-    // TODO: Currently we don't have san-serif italic type face. This is actually san-serif
-    // non-italic type face.
-    private final Typeface TYPEFACE_ITALIC = Typeface.create(Typeface.SANS_SERIF, Typeface.ITALIC);
+    private final int KEY_LABEL_OPTION_FONT_NORMAL = 16;
 
     private final UIHandler mHandler = new UIHandler();
 
@@ -825,8 +822,8 @@ public class BaseKeyboardView extends View implements PointerTracker.UIProxy {
                 final int labelSize;
                 if (label.length() > 1 && key.codes.length < 2) {
                     labelSize = mLabelTextSize;
-                    if ((key.labelOption & KEY_LABEL_OPTION_FONT_ITALIC) != 0) {
-                        paint.setTypeface(TYPEFACE_ITALIC);
+                    if ((key.labelOption & KEY_LABEL_OPTION_FONT_NORMAL) != 0) {
+                        paint.setTypeface(Typeface.DEFAULT);
                     } else {
                         paint.setTypeface(Typeface.DEFAULT_BOLD);
                     }