diff options
| author | Tadashi G. Takaoka <takaoka@google.com> | 2014-09-17 14:14:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-17 14:14:00 +0000 |
| commit | 179a39d17541ff925a1c3506b7dc737ddbd24da5 (patch) | |
| tree | 9c796f6ece34ec180829fc09962f55b6ce1860fe /java/src/com/android/inputmethod/keyboard/Key.java | |
| parent | 81a419478548063ef5245c377ad4a7549108049f (diff) | |
| parent | edfc8daed9ab32b225fa6e83460e6cc376623879 (diff) | |
am edfc8dae: am 4cbfee7a: am c5a8bc61: am 5ae05786: Merge "Fix drawing of custom action label key" into lmp-dev
* commit 'edfc8daed9ab32b225fa6e83460e6cc376623879':
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); |