diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-09-16 23:59:08 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-09-16 23:59:08 +0000 |
| commit | 44398bb5e16e5018189dcedfb13c78fe97056667 (patch) | |
| tree | be4d14b83a69e6e25b28cedfa63766b433c7c05e /java/src | |
| parent | da9bd4b9fe2fdbf1af8fb7e142d9865c9adabb79 (diff) | |
| parent | cf5fc1ea065873cd6d7b1d5d467940e4e45354d3 (diff) | |
| download | latinime-44398bb5e16e5018189dcedfb13c78fe97056667.tar.gz latinime-44398bb5e16e5018189dcedfb13c78fe97056667.tar.xz latinime-44398bb5e16e5018189dcedfb13c78fe97056667.zip | |
am cf5fc1ea: am 4e1f1689: am 5ae05786: Merge "Fix drawing of custom action label key" into lmp-dev
* commit 'cf5fc1ea065873cd6d7b1d5d467940e4e45354d3':
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 bd1c1479a..99a34bec7 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( |