commit cee512b63ed74ed6d9dab25bd1c19376fe98e1ce
author Tadashi G. Takaoka <takaoka@google.com> Thu Apr 11 03:51:42 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 11 03:51:42 2013 +0000
tree 160968cf74797a2bd718afd2a81ceffcb2c43b6d
parent 3722f0877e1a8032b0cce71778832b80c269abfb
parent a4463d7a9a9b97ad0fba764698f75cd3bf036c12

Merge "More precise geometry checking for more keys keyboard"

java/src/com/android/inputmethod/keyboard/MoreKeysKeyboard.java

diff --git a/java/src/com/android/inputmethod/keyboard/MoreKeysKeyboard.java b/java/src/com/android/inputmethod/keyboard/MoreKeysKeyboard.java
index 66c3014..f81ab8d 100644
--- a/java/src/com/android/inputmethod/keyboard/MoreKeysKeyboard.java
+++ b/java/src/com/android/inputmethod/keyboard/MoreKeysKeyboard.java
@@ -73,10 +73,11 @@
                 final int rowHeight, final int coordXInParent, final int parentKeyboardWidth,
                 final boolean isFixedColumnOrder, final int dividerWidth) {
             mIsFixedOrder = isFixedColumnOrder;
-            if (parentKeyboardWidth / keyWidth < maxColumns) {
+            if (parentKeyboardWidth / keyWidth < Math.min(numKeys, maxColumns)) {
                 throw new IllegalArgumentException(
                         "Keyboard is too small to hold more keys keyboard: "
-                                + parentKeyboardWidth + " " + keyWidth + " " + maxColumns);
+                                + parentKeyboardWidth + " " + keyWidth + " "
+                                + numKeys + " " + maxColumns);
             }
             mDefaultKeyWidth = keyWidth;
             mDefaultRowHeight = rowHeight;