diff options
| author | Tadashi G. Takaoka <takaoka@google.com> | 2014-09-16 23:31:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-16 23:31:00 +0000 |
| commit | c5a8bc618aae7fb30b5e0112254ead8b31fa161f (patch) | |
| tree | 41a6d152bdd98a1ac81de728fc85f6bc88c98639 /java/src/com/android/inputmethod/keyboard/Key.java | |
| parent | 64334e4f7f871c8192108679db0be38d42c8c7c0 (diff) | |
| parent | 5ae057862e316bac7971d2ec325e57d5ff54c592 (diff) | |
am 5ae05786: Merge "Fix drawing of custom action label key" into lmp-dev
* commit '5ae057862e316bac7971d2ec325e57d5ff54c592':
Fix drawing of custom action label key
Diffstat (limited to 'java/src/com/android/inputmethod/keyboard/Key.java')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/Key.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/Key.java b/java/src/com/android/inputmethod/keyboard/Key.java index 86ea4c563..81ea90a4d 100644 --- a/java/src/com/android/inputmethod/keyboard/Key.java +++ b/java/src/com/android/inputmethod/keyboard/Key.java @@ -702,6 +702,10 @@ public class Key implements Comparable<Key> { return ((mLabelFlags | defaultFlags) & LABEL_FLAGS_KEEP_BACKGROUND_ASPECT_RATIO) != 0; } + public final boolean hasCustomActionLabel() { + return (mLabelFlags & LABEL_FLAGS_FROM_CUSTOM_ACTION_LABEL) != 0; + } + private final boolean isShiftedLetterActivated() { return (mLabelFlags & LABEL_FLAGS_SHIFTED_LETTER_ACTIVATED) != 0 && !TextUtils.isEmpty(mHintLabel); |