nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Use normal font for functional key label instead of italic font"

main
Tadashi G. Takaoka 2010-11-23 01:01:43 -08:00 committed by Android (Google) Code Review
parent cc359dddb3 fab243a183
commit a444889403
10 changed files with 28 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java/res/values-xlarge/dimens.xml
View File

@ -35,7 +35,7 @@
<dimen name="mini_keyboard_vertical_correction">-13.0mm</dimen>
<dimen name="key_text_size">0.175in</dimen>
<dimen name="key_label_text_size">0.100in</dimen>
<dimen name="key_label_text_size">0.110in</dimen>
<dimen name="key_preview_text_size_large">0.245in</dimen>
<dimen name="candidate_strip_height">46dip</dimen>

2
java/res/values/attrs.xml
View File

@ -112,7 +112,7 @@
<flag name="alignLeft" value="1" />
<flag name="alignRight" value="2" />
<flag name="alignBottom" value="8" />
<flag name="fontItalic" value="16" />
<flag name="fontNormal" value="16" />
</attr>
<!-- The unicode that this key generates in manual temporary upper case mode. -->
<attr name="manualTemporaryUpperCaseCode" format="integer" />

8
java/res/xml-xlarge/kbd_phone.xml
View File

@ -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" />

8
java/res/xml-xlarge/kbd_phone_symbols.xml
View File

@ -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" />

2
java/res/xml-xlarge/kbd_qwerty_row1.xml
View File

@ -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" />

4
java/res/xml-xlarge/kbd_qwerty_row2.xml
View File

@ -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" />

4
java/res/xml-xlarge/kbd_qwerty_row3.xml
View File

@ -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"

10
java/res/xml-xlarge/kbd_symbols.xml
View File

@ -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"

10
java/res/xml-xlarge/kbd_symbols_shift.xml
View File

@ -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"

9
java/src/com/android/inputmethod/latin/BaseKeyboardView.java
View File

@ -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);
}