diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2013-12-13 08:34:03 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-12-13 08:34:03 -0800 |
| commit | d0a8f204ad98ef8354b2592e87c6a49483f1ee8b (patch) | |
| tree | e8732cfda435d0f8e900123403986e60a4348dc3 /java/src | |
| parent | 70792c997a45d780c33010522d97f6da0fe2bd86 (diff) | |
| parent | bf7503ae6bd19c06d734adfb84eaf130dd6e66b8 (diff) | |
| download | latinime-d0a8f204ad98ef8354b2592e87c6a49483f1ee8b.tar.gz latinime-d0a8f204ad98ef8354b2592e87c6a49483f1ee8b.tar.xz latinime-d0a8f204ad98ef8354b2592e87c6a49483f1ee8b.zip | |
am bf7503ae: Merge "Fix key top letter color in shifted layout"
* commit 'bf7503ae6bd19c06d734adfb84eaf130dd6e66b8':
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() { |