nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am cee512b6: Merge "More precise geometry checking for more keys keyboard" 

* commit 'cee512b63ed74ed6d9dab25bd1c19376fe98e1ce':
  More precise geometry checking for more keys keyboard
main
Tadashi G. Takaoka 2013-04-10 20:54:47 -07:00 committed by Android Git Automerger
parent b7917ee347 cee512b63e
commit 1dc7fd3f80
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
java/src/com/android/inputmethod/keyboard/MoreKeysKeyboard.java
View File

@ -73,10 +73,11 @@ public final class MoreKeysKeyboard extends Keyboard {
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;