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/KeyboardView.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/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( |