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

Add followKeyLabelRatio flag for keyLabelFlags of Key attribute 

This change renames largeLetter flag to followKeyLargeLetterRatio as
well.

Change-Id: Ida777aac57e4d885fa051654fe863f493f8e946a
main
Tadashi G. Takaoka 2012-04-11 12:34:30 +09:00
parent 10f18f5fb7
commit ab0d0d8a02
5 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -275,10 +275,11 @@
<flag name="alignLeft" value="0x01" />
<flag name="alignRight" value="0x02" />
<flag name="alignLeftOfCenter" value="0x08" />
<flag name="largeLetter" value="0x10" />
<flag name="fontNormal" value="0x20" />
<flag name="fontMonoSpace" value="0x40" />
<flag name="fontNormal" value="0x10" />
<flag name="fontMonoSpace" value="0x20" />
<flag name="followKeyLargeLetterRatio" value="0x40" />
<flag name="followKeyLetterRatio" value="0x80" />
<flag name="followKeyLabelRatio" value="0xC0" />
<flag name="followKeyHintLabelRatio" value="0x100" />
<flag name="hasPopupHint" value="0x200" />
<flag name="hasShiftedLetterHint" value="0x400" />

2
java/res/xml/key_styles_enter.xml
View File

@ -94,7 +94,7 @@
latin:styleName="defaultEnterKeyStyle"
latin:code="!code/key_enter"
latin:keyIcon="iconReturnKey"
latin:keyLabelFlags="autoXScale|preserveCase"
latin:keyLabelFlags="autoXScale|preserveCase|followKeyLabelRatio"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional"
latin:parentStyle="navigateMoreKeysStyle" />

4
java/res/xml/key_styles_number.xml
View File

@ -26,7 +26,7 @@
latin:keyActionFlags="noKeyPreview" />
<key-style
latin:styleName="numKeyStyle"
latin:keyLabelFlags="largeLetter|followKeyLetterRatio"
latin:keyLabelFlags="followKeyLargeLetterRatio"
latin:parentStyle="numKeyBaseStyle" />
<key-style
latin:styleName="numModeKeyStyle"
@ -34,7 +34,7 @@
latin:parentStyle="numKeyBaseStyle" />
<key-style
latin:styleName="numFunctionalKeyStyle"
latin:keyLabelFlags="largeLetter|followKeyLetterRatio"
latin:keyLabelFlags="followKeyLargeLetterRatio"
latin:backgroundType="functional"
latin:parentStyle="numKeyBaseStyle" />
<key-style

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

@ -60,10 +60,12 @@ public class Key {
private static final int LABEL_FLAGS_ALIGN_LEFT = 0x01;
private static final int LABEL_FLAGS_ALIGN_RIGHT = 0x02;
private static final int LABEL_FLAGS_ALIGN_LEFT_OF_CENTER = 0x08;
private static final int LABEL_FLAGS_LARGE_LETTER = 0x10;
private static final int LABEL_FLAGS_FONT_NORMAL = 0x20;
private static final int LABEL_FLAGS_FONT_MONO_SPACE = 0x40;
public static final int LABEL_FLAGS_FOLLOW_KEY_LETTER_RATIO = 0x80;
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_FOLLOW_KEY_RATIO_MASK = 0x1C0;
private static final int LABEL_FLAGS_FOLLOW_KEY_LARGE_LETTER_RATIO = 0x40;
private static final int LABEL_FLAGS_FOLLOW_KEY_LETTER_RATIO = 0x80;
private static final int LABEL_FLAGS_FOLLOW_KEY_LABEL_RATIO = 0xC0;
private static final int LABEL_FLAGS_FOLLOW_KEY_HINT_LABEL_RATIO = 0x100;
private static final int LABEL_FLAGS_HAS_POPUP_HINT = 0x200;
private static final int LABEL_FLAGS_HAS_SHIFTED_LETTER_HINT = 0x400;
@ -498,16 +500,17 @@ public class Key {
}
public int selectTextSize(int letter, int largeLetter, int label, int hintLabel) {
if (StringUtils.codePointCount(mLabel) > 1
&& (mLabelFlags & (LABEL_FLAGS_FOLLOW_KEY_LETTER_RATIO
| LABEL_FLAGS_FOLLOW_KEY_HINT_LABEL_RATIO)) == 0) {
return label;
} else if ((mLabelFlags & LABEL_FLAGS_FOLLOW_KEY_HINT_LABEL_RATIO) != 0) {
return hintLabel;
} else if ((mLabelFlags & LABEL_FLAGS_LARGE_LETTER) != 0) {
switch (mLabelFlags & LABEL_FLAGS_FOLLOW_KEY_RATIO_MASK) {
case LABEL_FLAGS_FOLLOW_KEY_LARGE_LETTER_RATIO:
return largeLetter;
} else {
case LABEL_FLAGS_FOLLOW_KEY_LETTER_RATIO:
return letter;
case LABEL_FLAGS_FOLLOW_KEY_LABEL_RATIO:
return label;
case LABEL_FLAGS_FOLLOW_KEY_HINT_LABEL_RATIO:
return hintLabel;
default: // No follow key ratio flag specified.
return StringUtils.codePointCount(mLabel) == 1 ? letter : label;
}
}
@ -563,6 +566,12 @@ public class Key {
return (mMoreKeysColumnAndFlags & MORE_KEYS_FLAGS_HAS_LABELS) != 0;
}
public int getMoreKeyLabelFlags() {
return hasLabelsInMoreKeys()
? LABEL_FLAGS_FOLLOW_KEY_LABEL_RATIO
: LABEL_FLAGS_FOLLOW_KEY_LETTER_RATIO;
}
public boolean needsDividersInMoreKeys() {
return (mMoreKeysColumnAndFlags & MORE_KEYS_FLAGS_NEEDS_DIVIDERS) != 0;
}

5
java/src/com/android/inputmethod/keyboard/MoreKeysKeyboard.java
View File

@ -332,10 +332,7 @@ public class MoreKeysKeyboard extends Keyboard {
@Override
public MoreKeysKeyboard build() {
final MoreKeysKeyboardParams params = mParams;
// moreKeyFlags == 0 means that the rendered text size will be determined by its
// label's code point count.
final int moreKeyFlags = mParentKey.hasLabelsInMoreKeys() ? 0
: Key.LABEL_FLAGS_FOLLOW_KEY_LETTER_RATIO;
final int moreKeyFlags = mParentKey.getMoreKeyLabelFlags();
final MoreKeySpec[] moreKeys = mParentKey.mMoreKeys;
for (int n = 0; n < moreKeys.length; n++) {
final MoreKeySpec moreKeySpec = moreKeys[n];