diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2013-12-13 09:55:19 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2013-12-13 09:55:19 +0000 |
| commit | bf7503ae6bd19c06d734adfb84eaf130dd6e66b8 (patch) | |
| tree | 283a358008fc621220bc4b763eae1ccdf0c4af74 /java/src | |
| parent | 3e81d9c39f1729efe08b53019ccd29bd0b4c5ff5 (diff) | |
| parent | 815a339201021805ade8954681bb764f1ec36ff1 (diff) | |
| download | latinime-bf7503ae6bd19c06d734adfb84eaf130dd6e66b8.tar.gz latinime-bf7503ae6bd19c06d734adfb84eaf130dd6e66b8.tar.xz latinime-bf7503ae6bd19c06d734adfb84eaf130dd6e66b8.zip | |
Merge "Fix key top letter color in shifted layout"
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/Key.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/Key.java b/java/src/com/android/inputmethod/keyboard/Key.java index b975b9c70..c8c4d30ef 100644 --- a/java/src/com/android/inputmethod/keyboard/Key.java +++ b/java/src/com/android/inputmethod/keyboard/Key.java @@ -348,8 +348,7 @@ public class Key implements Comparable<Key> { if (StringUtils.codePointCount(mLabel) == 1) { // Use the first letter of the hint label if shiftedLetterActivated flag is // specified. - if (hasShiftedLetterHint() && isShiftedLetterActivated() - && !TextUtils.isEmpty(mHintLabel)) { + if (hasShiftedLetterHint() && isShiftedLetterActivated()) { mCode = mHintLabel.codePointAt(0); } else { mCode = mLabel.codePointAt(0); @@ -687,7 +686,8 @@ public class Key implements Comparable<Key> { } 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() { @@ -710,8 +710,9 @@ public class Key implements Comparable<Key> { return (mLabelFlags & LABEL_FLAGS_AUTO_SCALE) == LABEL_FLAGS_AUTO_SCALE; } - public final boolean isShiftedLetterActivated() { - return (mLabelFlags & LABEL_FLAGS_SHIFTED_LETTER_ACTIVATED) != 0; + private final boolean isShiftedLetterActivated() { + return (mLabelFlags & LABEL_FLAGS_SHIFTED_LETTER_ACTIVATED) != 0 + && !TextUtils.isEmpty(mHintLabel); } public final int getMoreKeysColumn() { |