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

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

* commit '1dc7fd3f8085c5a729061a7b35f71a2024a5ce0b':
  More precise geometry checking for more keys keyboard
main
Tadashi G. Takaoka 2013-04-17 19:41:00 -07:00 committed by Android Git Automerger
parent e910a9c94a 1dc7fd3f80
commit dabcd969c5
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 int rowHeight, final int coordXInParent, final int parentKeyboardWidth,
final boolean isFixedColumnOrder, final int dividerWidth) { final boolean isFixedColumnOrder, final int dividerWidth) {
mIsFixedOrder = isFixedColumnOrder; mIsFixedOrder = isFixedColumnOrder;
if (parentKeyboardWidth / keyWidth < maxColumns) { if (parentKeyboardWidth / keyWidth < Math.min(numKeys, maxColumns)) {
throw new IllegalArgumentException( throw new IllegalArgumentException(
"Keyboard is too small to hold more keys keyboard: " "Keyboard is too small to hold more keys keyboard: "
+ parentKeyboardWidth + " " + keyWidth + " " + maxColumns); + parentKeyboardWidth + " " + keyWidth + " "
+ numKeys + " " + maxColumns);
} }
mDefaultKeyWidth = keyWidth; mDefaultKeyWidth = keyWidth;
mDefaultRowHeight = rowHeight; mDefaultRowHeight = rowHeight;