Merge "More precise geometry checking for more keys 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;