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

am bf7503ae: Merge "Fix key top letter color in shifted layout" 

* commit 'bf7503ae6bd19c06d734adfb84eaf130dd6e66b8':
  Fix key top letter color in shifted layout
main
Tadashi G. Takaoka 2013-12-13 08:34:03 -08:00 committed by Android Git Automerger
parent 70792c997a bf7503ae6b
commit d0a8f204ad
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -348,8 +348,7 @@ public class Key implements Comparable<Key> {
if (StringUtils.codePointCount(mLabel) == 1) { if (StringUtils.codePointCount(mLabel) == 1) {
// Use the first letter of the hint label if shiftedLetterActivated flag is // Use the first letter of the hint label if shiftedLetterActivated flag is
// specified. // specified.
if (hasShiftedLetterHint() && isShiftedLetterActivated() if (hasShiftedLetterHint() && isShiftedLetterActivated()) {
&& !TextUtils.isEmpty(mHintLabel)) {
mCode = mHintLabel.codePointAt(0); mCode = mHintLabel.codePointAt(0);
} else { } else {
mCode = mLabel.codePointAt(0); mCode = mLabel.codePointAt(0);
@ -687,7 +686,8 @@ public class Key implements Comparable<Key> {
} }
public final boolean hasShiftedLetterHint() { public final boolean hasShiftedLetterHint() {
return (mLabelFlags & LABEL_FLAGS_HAS_SHIFTED_LETTER_HINT) != 0; return (mLabelFlags & LABEL_FLAGS_HAS_SHIFTED_LETTER_HINT) != 0
&& !TextUtils.isEmpty(mHintLabel);
} }
public final boolean hasHintLabel() { public final boolean hasHintLabel() {
@ -710,8 +710,9 @@ public class Key implements Comparable<Key> {
return (mLabelFlags & LABEL_FLAGS_AUTO_SCALE) == LABEL_FLAGS_AUTO_SCALE; return (mLabelFlags & LABEL_FLAGS_AUTO_SCALE) == LABEL_FLAGS_AUTO_SCALE;
} }
public final boolean isShiftedLetterActivated() { private final boolean isShiftedLetterActivated() {
return (mLabelFlags & LABEL_FLAGS_SHIFTED_LETTER_ACTIVATED) != 0; return (mLabelFlags & LABEL_FLAGS_SHIFTED_LETTER_ACTIVATED) != 0
&& !TextUtils.isEmpty(mHintLabel);
} }
public final int getMoreKeysColumn() { public final int getMoreKeysColumn() {