diff options
| author | Tadashi G. Takaoka <takaoka@google.com> | 2014-09-16 23:22:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-16 23:22:40 +0000 |
| commit | 5ae057862e316bac7971d2ec325e57d5ff54c592 (patch) | |
| tree | 1f8523bec88261f83176d7d0f981c2bfe2bef2f8 /java/src/com/android/inputmethod/keyboard/KeyboardView.java | |
| parent | 81c1daa9da9fec665670f29c9c3aec2dbf34c359 (diff) | |
| parent | dad7a5dffd35f9dd6ef7ada03f030f8093ffa7ae (diff) | |
Merge "Fix drawing of custom action label key" into lmp-dev
Diffstat (limited to 'java/src/com/android/inputmethod/keyboard/KeyboardView.java')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/KeyboardView.java | 4 |
1 files changed, 3 insertions, 1 deletions
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( |