aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2012-09-02 23:18:06 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-09-02 23:18:06 -0700
commit7217ea133e767ffaa5f51ee853b8603c394597ba (patch)
treeb4b1a804fe9b7f7f6038ff245bcebc9606c0303c /java/src
parentc45c13e7c0b1900686c4d64a7ef51dc1ea618f57 (diff)
parent46c123a2f9f38a2b89ba44eef07cf7e4f81c457d (diff)
downloadlatinime-7217ea133e767ffaa5f51ee853b8603c394597ba.tar.gz
latinime-7217ea133e767ffaa5f51ee853b8603c394597ba.tar.xz
latinime-7217ea133e767ffaa5f51ee853b8603c394597ba.zip
am 46c123a2: am ab5f9532: Use 5-row layout for Thai phone keybopard
* commit '46c123a2f9f38a2b89ba44eef07cf7e4f81c457d': Use 5-row layout for Thai phone keybopard
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/keyboard/KeyboardView.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardView.java b/java/src/com/android/inputmethod/keyboard/KeyboardView.java
index 0b4d70632..5b02f9f5a 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardView.java
@@ -647,7 +647,7 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy {
// Draw key icon.
if (key.mLabel == null && icon != null) {
- final int iconWidth = icon.getIntrinsicWidth();
+ final int iconWidth = Math.min(icon.getIntrinsicWidth(), keyWidth);
final int iconHeight = icon.getIntrinsicHeight();
final int iconX, alignX;
final int iconY = (keyHeight - iconHeight) / 2;