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

Merge "Fix Sinhala keyboard for tablet device"

main
Tadashi G. Takaoka 2014-07-07 08:08:41 +00:00 committed by Android (Google) Code Review
parent 7f102e389d 649de3f544
commit 9eb6804270
4 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -298,6 +298,7 @@
<flag name="alignLeftOfCenter" value="0x08" />
<flag name="fontNormal" value="0x10" />
<flag name="fontMonoSpace" value="0x20" />
<flag name="fontDefault" value="0x30" />
<flag name="followKeyLargeLetterRatio" value="0x40" />
<flag name="followKeyLetterRatio" value="0x80" />
<flag name="followKeyLabelRatio" value="0xC0" />

6
java/res/xml-sw600dp/keys_exclamation_question.xml
View File

@ -23,8 +23,10 @@
>
<Key
latin:keySpec="!"
latin:moreKeys="!text/morekeys_exclamation" />
latin:moreKeys="!text/morekeys_exclamation"
latin:keyLabelFlags="fontDefault" />
<Key
latin:keySpec="\?"
latin:moreKeys="!text/morekeys_question" />
latin:moreKeys="!text/morekeys_question"
latin:keyLabelFlags="fontDefault" />
</merge>

3
java/res/xml-sw600dp/rows_sinhala.xml
View File

@ -25,6 +25,7 @@
latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="8.182%p"
latin:keyLabelFlags="fontNormal|autoXScale"
>
<include
latin:keyboardLayout="@xml/rowkeys_sinhala1" />
@ -34,6 +35,7 @@
</Row>
<Row
latin:keyWidth="8.182%p"
latin:keyLabelFlags="fontNormal|autoXScale"
>
<include
latin:keyboardLayout="@xml/rowkeys_sinhala2" />
@ -43,6 +45,7 @@
</Row>
<Row
latin:keyWidth="8.182%p"
latin:keyLabelFlags="fontNormal|autoXScale"
>
<Key
latin:keyStyle="shiftKeyStyle"

15
java/src/com/android/inputmethod/keyboard/Key.java
View File

@ -62,8 +62,11 @@ public class Key implements Comparable<Key> {
private static final int LABEL_FLAGS_ALIGN_RIGHT = 0x02;
private static final int LABEL_FLAGS_ALIGN_BUTTOM = 0x04;
private static final int LABEL_FLAGS_ALIGN_LEFT_OF_CENTER = 0x08;
// Font typeface specification.
private static final int LABEL_FLAGS_FONT_MASK = 0x30;
private static final int LABEL_FLAGS_FONT_NORMAL = 0x10;
private static final int LABEL_FLAGS_FONT_MONO_SPACE = 0x20;
private static final int LABEL_FLAGS_FONT_DEFAULT = 0x30;
// Start of key text ratio enum values
private static final int LABEL_FLAGS_FOLLOW_KEY_TEXT_RATIO_MASK = 0x1C0;
private static final int LABEL_FLAGS_FOLLOW_KEY_LARGE_LETTER_RATIO = 0x40;
@ -567,14 +570,16 @@ public class Key implements Comparable<Key> {
}
public final Typeface selectTypeface(final KeyDrawParams params) {
// TODO: Handle "bold" here too?
if ((mLabelFlags & LABEL_FLAGS_FONT_NORMAL) != 0) {
switch (mLabelFlags & LABEL_FLAGS_FONT_MASK) {
case LABEL_FLAGS_FONT_NORMAL:
return Typeface.DEFAULT;
}
if ((mLabelFlags & LABEL_FLAGS_FONT_MONO_SPACE) != 0) {
case LABEL_FLAGS_FONT_MONO_SPACE:
return Typeface.MONOSPACE;
case LABEL_FLAGS_FONT_DEFAULT:
default:
// The type-face is specified by keyTypeface attribute.
return params.mTypeface;
}
return params.mTypeface;
}
public final int selectTextSize(final KeyDrawParams params) {