diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-09-16 23:30:17 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-09-16 23:30:17 +0000 |
| commit | 4e1f168967cf462e7cd54a4505d0d08ef9d4552d (patch) | |
| tree | 41a6d152bdd98a1ac81de728fc85f6bc88c98639 /java/src | |
| parent | 6e0e130eb3d1446bcefedac080d970d5c07893f8 (diff) | |
| parent | 5ae057862e316bac7971d2ec325e57d5ff54c592 (diff) | |
| download | latinime-4e1f168967cf462e7cd54a4505d0d08ef9d4552d.tar.gz latinime-4e1f168967cf462e7cd54a4505d0d08ef9d4552d.tar.xz latinime-4e1f168967cf462e7cd54a4505d0d08ef9d4552d.zip | |
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')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/Key.java | 4 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/KeyboardView.java | 4 |
2 files changed, 7 insertions, 1 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); diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardView.java b/java/src/com/android/inputmethod/keyboard/KeyboardView.java index bb3cbb0eb..98cd1da54 100644 --- a/java/src/com/android/inputmethod/keyboard/KeyboardView.java +++ b/java/src/com/android/inputmethod/keyboard/KeyboardView.java @@ -343,7 +343,9 @@ public class KeyboardView extends View { final int keyWidth = key.getDrawWidth(); final int keyHeight = key.getHeight(); final int bgWidth, bgHeight, bgX, bgY; - if (key.needsToKeepBackgroundAspectRatio(mDefaultKeyLabelFlags)) { + if (key.needsToKeepBackgroundAspectRatio(mDefaultKeyLabelFlags) + // HACK: To disable expanding normal/functional key background. + && !key.hasCustomActionLabel()) { final int intrinsicWidth = background.getIntrinsicWidth(); final int intrinsicHeight = background.getIntrinsicHeight(); final float minScale = Math.min( |