diff --git a/java/src/com/android/inputmethod/keyboard/Key.java b/java/src/com/android/inputmethod/keyboard/Key.java
index f00889e..afcb3b6 100644
--- a/java/src/com/android/inputmethod/keyboard/Key.java
+++ b/java/src/com/android/inputmethod/keyboard/Key.java
@@ -108,11 +108,23 @@
     private final MoreKeySpec[] mMoreKeys;
     /** More keys column number and flags */
     private final int mMoreKeysColumnAndFlags;
-    private static final int MORE_KEYS_COLUMN_MASK = 0x000000ff;
-    private static final int MORE_KEYS_FLAGS_FIXED_COLUMN_ORDER = 0x80000000;
+    private static final int MORE_KEYS_COLUMN_NUMBER_MASK = 0x000000ff;
+    // If this flag is specified, more keys keyboard should have the specified number of columns.
+    // Otherwise more keys keyboard should have less than or equal to the specified maximum number
+    // of columns.
+    private static final int MORE_KEYS_FLAGS_FIXED_COLUMN = 0x00000100;
+    // If this flag is specified, the order of more keys is determined by the order in the more
+    // keys' specification. Otherwise the order of more keys is automatically determined.
+    private static final int MORE_KEYS_FLAGS_FIXED_ORDER = 0x00000200;
+    private static final int MORE_KEYS_MODE_MAX_COLUMN_WITH_AUTO_ORDER = 0;
+    private static final int MORE_KEYS_MODE_FIXED_COLUMN_WITH_AUTO_ORDER =
+            MORE_KEYS_FLAGS_FIXED_COLUMN;
+    private static final int MORE_KEYS_MODE_FIXED_COLUMN_WITH_FIXED_ORDER =
+            (MORE_KEYS_FLAGS_FIXED_COLUMN | MORE_KEYS_FLAGS_FIXED_ORDER);
     private static final int MORE_KEYS_FLAGS_HAS_LABELS = 0x40000000;
     private static final int MORE_KEYS_FLAGS_NEEDS_DIVIDERS = 0x20000000;
     private static final int MORE_KEYS_FLAGS_NO_PANEL_AUTO_MORE_KEY = 0x10000000;
+    // TODO: Rename these specifiers to !autoOrder! and !fixedOrder! respectively.
     private static final String MORE_KEYS_AUTO_COLUMN_ORDER = "!autoColumnOrder!";
     private static final String MORE_KEYS_FIXED_COLUMN_ORDER = "!fixedColumnOrder!";
     private static final String MORE_KEYS_HAS_LABELS = "!hasLabels!";
@@ -255,25 +267,31 @@
         int actionFlags = style.getFlags(keyAttr, R.styleable.Keyboard_Key_keyActionFlags);
         String[] moreKeys = style.getStringArray(keyAttr, R.styleable.Keyboard_Key_moreKeys);
 
-        int moreKeysColumn = style.getInt(keyAttr,
-                R.styleable.Keyboard_Key_maxMoreKeysColumn, params.mMaxMoreKeysKeyboardColumn);
+        // Get maximum column order number and set a relevant mode value.
+        int moreKeysColumnAndFlags = MORE_KEYS_MODE_MAX_COLUMN_WITH_AUTO_ORDER
+                | style.getInt(keyAttr, R.styleable.Keyboard_Key_maxMoreKeysColumn,
+                        params.mMaxMoreKeysKeyboardColumn);
         int value;
         if ((value = MoreKeySpec.getIntValue(moreKeys, MORE_KEYS_AUTO_COLUMN_ORDER, -1)) > 0) {
-            moreKeysColumn = value & MORE_KEYS_COLUMN_MASK;
+            // Override with fixed column order number and set a relevant mode value.
+            moreKeysColumnAndFlags = MORE_KEYS_MODE_FIXED_COLUMN_WITH_AUTO_ORDER
+                    | (value & MORE_KEYS_COLUMN_NUMBER_MASK);
         }
         if ((value = MoreKeySpec.getIntValue(moreKeys, MORE_KEYS_FIXED_COLUMN_ORDER, -1)) > 0) {
-            moreKeysColumn = MORE_KEYS_FLAGS_FIXED_COLUMN_ORDER | (value & MORE_KEYS_COLUMN_MASK);
+            // Override with fixed column order number and set a relevant mode value.
+            moreKeysColumnAndFlags = MORE_KEYS_MODE_FIXED_COLUMN_WITH_FIXED_ORDER
+                    | (value & MORE_KEYS_COLUMN_NUMBER_MASK);
         }
         if (MoreKeySpec.getBooleanValue(moreKeys, MORE_KEYS_HAS_LABELS)) {
-            moreKeysColumn |= MORE_KEYS_FLAGS_HAS_LABELS;
+            moreKeysColumnAndFlags |= MORE_KEYS_FLAGS_HAS_LABELS;
         }
         if (MoreKeySpec.getBooleanValue(moreKeys, MORE_KEYS_NEEDS_DIVIDERS)) {
-            moreKeysColumn |= MORE_KEYS_FLAGS_NEEDS_DIVIDERS;
+            moreKeysColumnAndFlags |= MORE_KEYS_FLAGS_NEEDS_DIVIDERS;
         }
         if (MoreKeySpec.getBooleanValue(moreKeys, MORE_KEYS_NO_PANEL_AUTO_MORE_KEY)) {
-            moreKeysColumn |= MORE_KEYS_FLAGS_NO_PANEL_AUTO_MORE_KEY;
+            moreKeysColumnAndFlags |= MORE_KEYS_FLAGS_NO_PANEL_AUTO_MORE_KEY;
         }
-        mMoreKeysColumnAndFlags = moreKeysColumn;
+        mMoreKeysColumnAndFlags = moreKeysColumnAndFlags;
 
         final String[] additionalMoreKeys;
         if ((mLabelFlags & LABEL_FLAGS_DISABLE_ADDITIONAL_MORE_KEYS) != 0) {
@@ -680,12 +698,16 @@
                 && !TextUtils.isEmpty(mHintLabel);
     }
 
-    public final int getMoreKeysColumn() {
-        return mMoreKeysColumnAndFlags & MORE_KEYS_COLUMN_MASK;
+    public final int getMoreKeysColumnNumber() {
+        return mMoreKeysColumnAndFlags & MORE_KEYS_COLUMN_NUMBER_MASK;
     }
 
-    public final boolean isFixedColumnOrderMoreKeys() {
-        return (mMoreKeysColumnAndFlags & MORE_KEYS_FLAGS_FIXED_COLUMN_ORDER) != 0;
+    public final boolean isMoreKeysFixedColumn() {
+        return (mMoreKeysColumnAndFlags & MORE_KEYS_FLAGS_FIXED_COLUMN) != 0;
+    }
+
+    public final boolean isMoreKeysFixedOrder() {
+        return (mMoreKeysColumnAndFlags & MORE_KEYS_FLAGS_FIXED_ORDER) != 0;
     }
 
     public final boolean hasLabelsInMoreKeys() {
diff --git a/java/src/com/android/inputmethod/keyboard/MoreKeysKeyboard.java b/java/src/com/android/inputmethod/keyboard/MoreKeysKeyboard.java
index e0184d7..52e2e85 100644
--- a/java/src/com/android/inputmethod/keyboard/MoreKeysKeyboard.java
+++ b/java/src/com/android/inputmethod/keyboard/MoreKeysKeyboard.java
@@ -43,7 +43,7 @@
 
     @UsedForTesting
     static class MoreKeysKeyboardParams extends KeyboardParams {
-        public boolean mIsFixedOrder;
+        public boolean mIsMoreKeysFixedOrder;
         /* package */int mTopRowAdjustment;
         public int mNumRows;
         public int mNumColumns;
@@ -61,29 +61,35 @@
          * Set keyboard parameters of more keys keyboard.
          *
          * @param numKeys number of keys in this more keys keyboard.
-         * @param maxColumns number of maximum columns of this more keys keyboard.
+         * @param numColumn number of columns of this more keys keyboard.
          * @param keyWidth more keys keyboard key width in pixel, including horizontal gap.
          * @param rowHeight more keys keyboard row height in pixel, including vertical gap.
          * @param coordXInParent coordinate x of the key preview in parent keyboard.
          * @param parentKeyboardWidth parent keyboard width in pixel.
-         * @param isFixedColumnOrder if true, more keys should be laid out in fixed order.
+         * @param isMoreKeysFixedColumn true if more keys keyboard should have
+         *   <code>numColumn</code> columns. Otherwise more keys keyboard should have
+         *   <code>numColumn</code> columns at most.
+         * @param isMoreKeysFixedOrder true if the order of more keys is determined by the order in
+         *   the more keys' specification. Otherwise the order of more keys is automatically
+         *   determined.
          * @param dividerWidth width of divider, zero for no dividers.
          */
-        public void setParameters(final int numKeys, final int maxColumns, final int keyWidth,
+        public void setParameters(final int numKeys, final int numColumn, final int keyWidth,
                 final int rowHeight, final int coordXInParent, final int parentKeyboardWidth,
-                final boolean isFixedColumnOrder, final int dividerWidth) {
-            mIsFixedOrder = isFixedColumnOrder;
-            if (parentKeyboardWidth / keyWidth < Math.min(numKeys, maxColumns)) {
+                final boolean isMoreKeysFixedColumn, final boolean isMoreKeysFixedOrder,
+                final int dividerWidth) {
+            mIsMoreKeysFixedOrder = isMoreKeysFixedOrder;
+            if (parentKeyboardWidth / keyWidth < Math.min(numKeys, numColumn)) {
                 throw new IllegalArgumentException("Keyboard is too small to hold more keys: "
-                        + parentKeyboardWidth + " " + keyWidth + " " + numKeys + " " + maxColumns);
+                        + parentKeyboardWidth + " " + keyWidth + " " + numKeys + " " + numColumn);
             }
             mDefaultKeyWidth = keyWidth;
             mDefaultRowHeight = rowHeight;
 
-            final int numRows = (numKeys + maxColumns - 1) / maxColumns;
+            final int numRows = (numKeys + numColumn - 1) / numColumn;
             mNumRows = numRows;
-            final int numColumns = mIsFixedOrder ? Math.min(numKeys, maxColumns)
-                    : getOptimizedColumns(numKeys, maxColumns);
+            final int numColumns = isMoreKeysFixedColumn ? Math.min(numKeys, numColumn)
+                    : getOptimizedColumns(numKeys, numColumn);
             mNumColumns = numColumns;
             final int topKeys = numKeys % numColumns;
             mTopKeys = topKeys == 0 ? numColumns : topKeys;
@@ -120,7 +126,7 @@
             mRightKeys = rightKeys;
 
             // Adjustment of the top row.
-            mTopRowAdjustment = mIsFixedOrder ? getFixedOrderTopRowAdjustment()
+            mTopRowAdjustment = isMoreKeysFixedOrder ? getFixedOrderTopRowAdjustment()
                     : getAutoOrderTopRowAdjustment();
             mDividerWidth = dividerWidth;
             mColumnWidth = mDefaultKeyWidth + mDividerWidth;
@@ -148,7 +154,7 @@
 
         // Return key position according to column count (0 is default).
         /* package */int getColumnPos(final int n) {
-            return mIsFixedOrder ? getFixedOrderColumnPos(n) : getAutomaticColumnPos(n);
+            return mIsMoreKeysFixedOrder ? getFixedOrderColumnPos(n) : getAutomaticColumnPos(n);
         }
 
         private int getFixedOrderColumnPos(final int n) {
@@ -263,7 +269,8 @@
          * @param keyboard the {@link Keyboard} that contains the parentKey.
          * @param isSingleMoreKeyWithPreview true if the <code>key</code> has just a single
          *        "more key" and its key popup preview is enabled.
-         * @param keyPreviewDrawParams the parameter to place key preview.
+         * @param keyPreviewVisibleWidth the width of visible part of key popup preview.
+         * @param keyPreviewVisibleHeight the height of visible part of key popup preview
          * @param paintToMeasure the {@link Paint} object to measure a "more key" width
          */
         public Builder(final Context context, final Key key, final Keyboard keyboard,
@@ -306,9 +313,9 @@
                 dividerWidth = 0;
             }
             final MoreKeySpec[] moreKeys = key.getMoreKeys();
-            mParams.setParameters(moreKeys.length, key.getMoreKeysColumn(), keyWidth, rowHeight,
+            mParams.setParameters(moreKeys.length, key.getMoreKeysColumnNumber(), keyWidth, rowHeight,
                     key.getX() + key.getWidth() / 2, keyboard.mId.mWidth,
-                    key.isFixedColumnOrderMoreKeys(), dividerWidth);
+                    key.isMoreKeysFixedColumn(), key.isMoreKeysFixedOrder(), dividerWidth);
         }
 
         private static int getMaxKeyWidth(final Key parentKey, final int minKeyWidth,
diff --git a/tests/src/com/android/inputmethod/keyboard/MoreKeysKeyboardBuilderAutoOrderTests.java b/tests/src/com/android/inputmethod/keyboard/MoreKeysKeyboardBuilderAutoOrderTests.java
new file mode 100644
index 0000000..ebefe2d
--- /dev/null
+++ b/tests/src/com/android/inputmethod/keyboard/MoreKeysKeyboardBuilderAutoOrderTests.java
@@ -0,0 +1,2464 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.inputmethod.keyboard;
+
+import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.MediumTest;
+
+import com.android.inputmethod.keyboard.MoreKeysKeyboard.MoreKeysKeyboardParams;
+
+@MediumTest
+public class MoreKeysKeyboardBuilderAutoOrderTests extends AndroidTestCase {
+    private static final int WIDTH = 10;
+    private static final int HEIGHT = 10;
+
+    private static final int KEYBOARD_WIDTH = WIDTH * 10;
+    private static final int XPOS_L0 = WIDTH * 0 + WIDTH / 2;
+    private static final int XPOS_L1 = WIDTH * 1 + WIDTH / 2;
+    private static final int XPOS_L2 = WIDTH * 2 + WIDTH / 2;
+    private static final int XPOS_L3 = WIDTH * 3 + WIDTH / 2;
+    private static final int XPOS_M0 = WIDTH * 4 + WIDTH / 2;
+    private static final int XPOS_M1 = WIDTH * 5 + WIDTH / 2;
+    private static final int XPOS_R3 = WIDTH * 6 + WIDTH / 2;
+    private static final int XPOS_R2 = WIDTH * 7 + WIDTH / 2;
+    private static final int XPOS_R1 = WIDTH * 8 + WIDTH / 2;
+    private static final int XPOS_R0 = WIDTH * 9 + WIDTH / 2;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+    }
+
+    private static MoreKeysKeyboardParams createParams(final int numKeys, final int columnNum,
+            final int coordXInParent) {
+        final MoreKeysKeyboardParams params = new MoreKeysKeyboardParams();
+        params.setParameters(numKeys, columnNum, WIDTH, HEIGHT, coordXInParent, KEYBOARD_WIDTH,
+                true /* isMoreKeysFixedColumn */, false /* isMoreKeysFixedOrder */,
+                0 /* dividerWidth */);
+        return params;
+    }
+
+    public void testLayoutError() {
+        MoreKeysKeyboardParams params = null;
+        try {
+            final int maxColumns = KEYBOARD_WIDTH / WIDTH;
+            params = createParams(maxColumns + 1, maxColumns + 1, HEIGHT);
+            fail("Should throw IllegalArgumentException");
+        } catch (IllegalArgumentException e) {
+            // Too small keyboard to hold more keys keyboard.
+        }
+        assertNull("Too small keyboard to hold more keys keyboard", params);
+    }
+
+    // More keys keyboard layout test.
+    // "[n]" represents n-th key position in more keys keyboard.
+    // "<1>" is the default key.
+
+    // <1>
+    public void testLayout1KeyAuto5M0() {
+        MoreKeysKeyboardParams params = createParams(1, 5, XPOS_M0);
+        assertEquals("1 key auto 5 M0 columns", 1, params.mNumColumns);
+        assertEquals("1 key auto 5 M0 rows", 1, params.mNumRows);
+        assertEquals("1 key auto 5 M0 left", 0, params.mLeftKeys);
+        assertEquals("1 key auto 5 M0 right", 1, params.mRightKeys);
+        assertEquals("1 key auto 5 M0 <1>", 0, params.getColumnPos(0));
+        assertEquals("1 key auto 5 M0 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("1 key auto 5 M0 default", WIDTH * 0, params.getDefaultKeyCoordX());
+    }
+
+    // |<1>
+    public void testLayout1KeyAuto5L0() {
+        MoreKeysKeyboardParams params = createParams(1, 5, XPOS_L0);
+        assertEquals("1 key auto 5 L0 columns", 1, params.mNumColumns);
+        assertEquals("1 key auto 5 L0 rows", 1, params.mNumRows);
+        assertEquals("1 key auto 5 L0 left", 0, params.mLeftKeys);
+        assertEquals("1 key auto 5 L0 right", 1, params.mRightKeys);
+        assertEquals("1 key auto 5 L0 <1>", 0, params.getColumnPos(0));
+        assertEquals("1 key auto 5 L0 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("1 key auto 5 L0 default", WIDTH * 0, params.getDefaultKeyCoordX());
+    }
+
+    // |___ <1>
+    public void testLayout1KeyAuto5L1() {
+        MoreKeysKeyboardParams params = createParams(1, 5, XPOS_L1);
+        assertEquals("1 key auto 5 L1 columns", 1, params.mNumColumns);
+        assertEquals("1 key auto 5 L1 rows", 1, params.mNumRows);
+        assertEquals("1 key auto 5 L1 left", 0, params.mLeftKeys);
+        assertEquals("1 key auto 5 L1 right", 1, params.mRightKeys);
+        assertEquals("1 key auto 5 L1 <1>", 0, params.getColumnPos(0));
+        assertEquals("1 key auto 5 L1 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("1 key auto 5 L1 default", WIDTH * 0, params.getDefaultKeyCoordX());
+    }
+
+    // |___ ___ <1>
+    public void testLayout1KeyAuto5L2() {
+        MoreKeysKeyboardParams params = createParams(1, 5, XPOS_L2);
+        assertEquals("1 key auto 5 L2 columns", 1, params.mNumColumns);
+        assertEquals("1 key auto 5 L2 rows", 1, params.mNumRows);
+        assertEquals("1 key auto 5 L2 left", 0, params.mLeftKeys);
+        assertEquals("1 key auto 5 L2 right", 1, params.mRightKeys);
+        assertEquals("1 key auto 5 L2 <1>", 0, params.getColumnPos(0));
+        assertEquals("1 key auto 5 L2 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("1 key auto 5 L2 default", WIDTH * 0, params.getDefaultKeyCoordX());
+    }
+
+    // <1>|
+    public void testLayout1KeyAuto5R0() {
+        MoreKeysKeyboardParams params = createParams(1, 5, XPOS_R0);
+        assertEquals("1 key auto 5 R0 columns", 1, params.mNumColumns);
+        assertEquals("1 key auto 5 R0 rows", 1, params.mNumRows);
+        assertEquals("1 key auto 5 R0 left", 0, params.mLeftKeys);
+        assertEquals("1 key auto 5 R0 right", 1, params.mRightKeys);
+        assertEquals("1 key auto 5 R0 <1>", 0, params.getColumnPos(0));
+        assertEquals("1 key auto 5 R0 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("1 key auto 5 R0 default", WIDTH * 0, params.getDefaultKeyCoordX());
+    }
+
+    // <1> ___|
+    public void testLayout1KeyAuto5R1() {
+        MoreKeysKeyboardParams params = createParams(1, 5, XPOS_R1);
+        assertEquals("1 key auto 5 R1 columns", 1, params.mNumColumns);
+        assertEquals("1 key auto 5 R1 rows", 1, params.mNumRows);
+        assertEquals("1 key auto 5 R1 left", 0, params.mLeftKeys);
+        assertEquals("1 key auto 5 R1 right", 1, params.mRightKeys);
+        assertEquals("1 key auto 5 R1 <1>", 0, params.getColumnPos(0));
+        assertEquals("1 key auto 5 R1 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("1 key auto 5 R1 default", WIDTH * 0, params.getDefaultKeyCoordX());
+    }
+
+    // <1> ___ ___|
+    public void testLayout1KeyAuto5R2() {
+        MoreKeysKeyboardParams params = createParams(1, 5, XPOS_R2);
+        assertEquals("1 key auto 5 R2 columns", 1, params.mNumColumns);
+        assertEquals("1 key auto 5 R2 rows", 1, params.mNumRows);
+        assertEquals("1 key auto 5 R2 left", 0, params.mLeftKeys);
+        assertEquals("1 key auto 5 R2 right", 1, params.mRightKeys);
+        assertEquals("1 key auto 5 R2 <1>", 0, params.getColumnPos(0));
+        assertEquals("1 key auto 5 R2 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("1 key auto 5 R2 default", WIDTH * 0, params.getDefaultKeyCoordX());
+    }
+
+    // <1> [2]
+    public void testLayout2KeyAuto5M0() {
+        MoreKeysKeyboardParams params = createParams(2, 5, XPOS_M0);
+        assertEquals("2 key auto 5 M0 columns", 2, params.mNumColumns);
+        assertEquals("2 key auto 5 M0 rows", 1, params.mNumRows);
+        assertEquals("2 key auto 5 M0 left", 0, params.mLeftKeys);
+        assertEquals("2 key auto 5 M0 right", 2, params.mRightKeys);
+        assertEquals("2 key auto 5 M0 <1>", 0, params.getColumnPos(0));
+        assertEquals("2 key auto 5 M0 [2]", 1, params.getColumnPos(1));
+        assertEquals("2 key auto 5 M0 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("2 key auto 5 M0 default", WIDTH * 0, params.getDefaultKeyCoordX());
+    }
+
+    // |<1> [2]
+    public void testLayout2KeyAuto5L0() {
+        MoreKeysKeyboardParams params = createParams(2, 5, XPOS_L0);
+        assertEquals("2 key auto 5 L0 columns", 2, params.mNumColumns);
+        assertEquals("2 key auto 5 L0 rows", 1, params.mNumRows);
+        assertEquals("2 key auto 5 L0 left", 0, params.mLeftKeys);
+        assertEquals("2 key auto 5 L0 right", 2, params.mRightKeys);
+        assertEquals("2 key auto 5 L0 <1>", 0, params.getColumnPos(0));
+        assertEquals("2 key auto 5 L0 [2]", 1, params.getColumnPos(1));
+        assertEquals("2 key auto 5 L0 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("2 key auto 5 L0 default", WIDTH * 0, params.getDefaultKeyCoordX());
+    }
+
+    // |___ <1> [2]
+    public void testLayout2KeyAuto5L1() {
+        MoreKeysKeyboardParams params = createParams(2, 5, XPOS_L1);
+        assertEquals("2 key auto 5 L1 columns", 2, params.mNumColumns);
+        assertEquals("2 key auto 5 L1 rows", 1, params.mNumRows);
+        assertEquals("2 key auto 5 L1 left", 0, params.mLeftKeys);
+        assertEquals("2 key auto 5 L1 right", 2, params.mRightKeys);
+        assertEquals("2 key auto 5 L1 <1>", 0, params.getColumnPos(0));
+        assertEquals("2 key auto 5 L1 [2]", 1, params.getColumnPos(1));
+        assertEquals("2 key auto 5 L1 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("2 key auto 5 L1 default", WIDTH * 0, params.getDefaultKeyCoordX());
+    }
+
+    // |___ ___ <1> [2]
+    public void testLayout2KeyAuto5L2() {
+        MoreKeysKeyboardParams params = createParams(2, 5, XPOS_L2);
+        assertEquals("2 key auto 5 L2 columns", 2, params.mNumColumns);
+        assertEquals("2 key auto 5 L2 rows", 1, params.mNumRows);
+        assertEquals("2 key auto 5 L2 left", 0, params.mLeftKeys);
+        assertEquals("2 key auto 5 L2 right", 2, params.mRightKeys);
+        assertEquals("2 key auto 5 L2 <1>", 0, params.getColumnPos(0));
+        assertEquals("2 key auto 5 L2 [2]", 1, params.getColumnPos(1));
+        assertEquals("2 key auto 5 L2 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("2 key auto 5 L2 default", WIDTH * 0, params.getDefaultKeyCoordX());
+    }
+
+    // [2] <1>|
+    public void testLayout2KeyAuto5R0() {
+        MoreKeysKeyboardParams params = createParams(2, 5, XPOS_R0);
+        assertEquals("2 key auto 5 R0 columns", 2, params.mNumColumns);
+        assertEquals("2 key auto 5 R0 rows", 1, params.mNumRows);
+        assertEquals("2 key auto 5 R0 left", 1, params.mLeftKeys);
+        assertEquals("2 key auto 5 R0 right", 1, params.mRightKeys);
+        assertEquals("2 key auto 5 R0 <1>", 0, params.getColumnPos(0));
+        assertEquals("2 key auto 5 R0 [2]", -1, params.getColumnPos(1));
+        assertEquals("2 key auto 5 R0 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("2 key auto 5 R0 default", WIDTH * 1, params.getDefaultKeyCoordX());
+    }
+
+    // [2] <1> ___|
+    public void testLayout2KeyAuto5R1() {
+        MoreKeysKeyboardParams params = createParams(2, 5, XPOS_R1);
+        assertEquals("2 key auto 5 R1 columns", 2, params.mNumColumns);
+        assertEquals("2 key auto 5 R1 rows", 1, params.mNumRows);
+        assertEquals("2 key auto 5 R1 left", 1, params.mLeftKeys);
+        assertEquals("2 key auto 5 R1 right", 1, params.mRightKeys);
+        assertEquals("2 key auto 5 R1 <1>", 0, params.getColumnPos(0));
+        assertEquals("2 key auto 5 R1 [2]", -1, params.getColumnPos(1));
+        assertEquals("2 key auto 5 R1 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("2 key auto 5 R1 default", WIDTH * 1, params.getDefaultKeyCoordX());
+    }
+
+    // <1> [2] ___|
+    public void testLayout2KeyAuto5R2() {
+        MoreKeysKeyboardParams params = createParams(2, 5, XPOS_R2);
+        assertEquals("2 key auto 5 R2 columns", 2, params.mNumColumns);
+        assertEquals("2 key auto 5 R2 rows", 1, params.mNumRows);
+        assertEquals("2 key auto 5 R2 left", 0, params.mLeftKeys);
+        assertEquals("2 key auto 5 R2 right", 2, params.mRightKeys);
+        assertEquals("2 key auto 5 R2 <1>", 0, params.getColumnPos(0));
+        assertEquals("2 key auto 5 R2 [2]", 1, params.getColumnPos(1));
+        assertEquals("2 key auto 5 R2 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("2 key auto 5 R2 default", WIDTH * 0, params.getDefaultKeyCoordX());
+    }
+
+    // [3] <1> [2]
+    public void testLayout3KeyAuto5M0() {
+        MoreKeysKeyboardParams params = createParams(3, 5, XPOS_M0);
+        assertEquals("3 key auto 5 M0 columns", 3, params.mNumColumns);
+        assertEquals("3 key auto 5 M0 rows", 1, params.mNumRows);
+        assertEquals("3 key auto 5 M0 left", 1, params.mLeftKeys);
+        assertEquals("3 key auto 5 M0 right", 2, params.mRightKeys);
+        assertEquals("3 key auto 5 M0 <1>", 0, params.getColumnPos(0));
+        assertEquals("3 key auto 5 M0 [2]", 1, params.getColumnPos(1));
+        assertEquals("3 key auto 5 M0 [3]", -1, params.getColumnPos(2));
+        assertEquals("3 key auto 5 M0 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("3 key auto 5 M0 default", WIDTH * 1, params.getDefaultKeyCoordX());
+    }
+
+    // |<1> [2] [3]
+    public void testLayout3KeyAuto5L0() {
+        MoreKeysKeyboardParams params = createParams(3, 5, XPOS_L0);
+        assertEquals("3 key auto 5 L0 columns", 3, params.mNumColumns);
+        assertEquals("3 key auto 5 L0 rows", 1, params.mNumRows);
+        assertEquals("3 key auto 5 L0 left", 0, params.mLeftKeys);
+        assertEquals("3 key auto 5 L0 right", 3, params.mRightKeys);
+        assertEquals("3 key auto 5 L0 <1>", 0, params.getColumnPos(0));
+        assertEquals("3 key auto 5 L0 [2]", 1, params.getColumnPos(1));
+        assertEquals("3 key auto 5 L0 [3]", 2, params.getColumnPos(2));
+        assertEquals("3 key auto 5 L0 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("3 key auto 5 L0 default", WIDTH * 0, params.getDefaultKeyCoordX());
+    }
+
+    // |___ <1> [2] [3]
+    public void testLayout3KeyAuto5L1() {
+        MoreKeysKeyboardParams params = createParams(3, 5, XPOS_L1);
+        assertEquals("3 key auto 5 L1 columns", 3, params.mNumColumns);
+        assertEquals("3 key auto 5 L1 rows", 1, params.mNumRows);
+        assertEquals("3 key auto 5 L1 left", 0, params.mLeftKeys);
+        assertEquals("3 key auto 5 L1 right", 3, params.mRightKeys);
+        assertEquals("3 key auto 5 L1 <1>", 0, params.getColumnPos(0));
+        assertEquals("3 key auto 5 L1 [2]", 1, params.getColumnPos(1));
+        assertEquals("3 key auto 5 L1 [3]", 2, params.getColumnPos(2));
+        assertEquals("3 key auto 5 L1 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("3 key auto 5 L1 default", WIDTH * 0, params.getDefaultKeyCoordX());
+    }
+
+    // |___ [3] <1> [2]
+    public void testLayout3KeyAuto5L2() {
+        MoreKeysKeyboardParams params = createParams(3, 5, XPOS_L2);
+        assertEquals("3 key auto 5 L2 columns", 3, params.mNumColumns);
+        assertEquals("3 key auto 5 L2 rows", 1, params.mNumRows);
+        assertEquals("3 key auto 5 L2 left", 1, params.mLeftKeys);
+        assertEquals("3 key auto 5 L2 right", 2, params.mRightKeys);
+        assertEquals("3 key auto 5 L2 <1>", 0, params.getColumnPos(0));
+        assertEquals("3 key auto 5 L2 [2]", 1, params.getColumnPos(1));
+        assertEquals("3 key auto 5 L2 [3]", -1, params.getColumnPos(2));
+        assertEquals("3 key auto 5 L2 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("3 key auto 5 L2 default", WIDTH * 1, params.getDefaultKeyCoordX());
+    }
+
+    // [3] [2] <1>|
+    public void testLayout3KeyAuto5R0() {
+        MoreKeysKeyboardParams params = createParams(3, 5, XPOS_R0);
+        assertEquals("3 key auto 5 R0 columns", 3, params.mNumColumns);
+        assertEquals("3 key auto 5 R0 rows", 1, params.mNumRows);
+        assertEquals("3 key auto 5 R0 left", 2, params.mLeftKeys);
+        assertEquals("3 key auto 5 R0 right", 1, params.mRightKeys);
+        assertEquals("3 key auto 5 R0 <1>", 0, params.getColumnPos(0));
+        assertEquals("3 key auto 5 R0 [2]", -1, params.getColumnPos(1));
+        assertEquals("3 key auto 5 R0 [3]", -2, params.getColumnPos(2));
+        assertEquals("3 key auto 5 R0 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("3 key auto 5 R0 default", WIDTH * 2, params.getDefaultKeyCoordX());
+    }
+
+    // [3] [2] <1> ___|
+    public void testLayout3KeyAuto5R1() {
+        MoreKeysKeyboardParams params = createParams(3, 5, XPOS_R1);
+        assertEquals("3 key auto 5 R1 columns", 3, params.mNumColumns);
+        assertEquals("3 key auto 5 R1 rows", 1, params.mNumRows);
+        assertEquals("3 key auto 5 R1 left", 2, params.mLeftKeys);
+        assertEquals("3 key auto 5 R1 right", 1, params.mRightKeys);
+        assertEquals("3 key auto 5 R1 <1>", 0, params.getColumnPos(0));
+        assertEquals("3 key auto 5 R1 [2]", -1, params.getColumnPos(1));
+        assertEquals("3 key auto 5 R1 [3]", -2, params.getColumnPos(2));
+        assertEquals("3 key auto 5 R1 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("3 key auto 5 R1 default", WIDTH * 2, params.getDefaultKeyCoordX());
+    }
+
+    // [3] <1> [2] ___|
+    public void testLayout3KeyAuto5R2() {
+        MoreKeysKeyboardParams params = createParams(3, 5, XPOS_R2);
+        assertEquals("3 key auto 5 R2 columns", 3, params.mNumColumns);
+        assertEquals("3 key auto 5 R2 rows", 1, params.mNumRows);
+        assertEquals("3 key auto 5 R2 left", 1, params.mLeftKeys);
+        assertEquals("3 key auto 5 R2 right", 2, params.mRightKeys);
+        assertEquals("3 key auto 5 R2 <1>", 0, params.getColumnPos(0));
+        assertEquals("3 key auto 5 R2 [2]", 1, params.getColumnPos(1));
+        assertEquals("3 key auto 5 R2 [3]", -1, params.getColumnPos(2));
+        assertEquals("3 key auto 5 R2 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("3 key auto 5 R2 default", WIDTH * 1, params.getDefaultKeyCoordX());
+    }
+
+    // [3]
+    // <1> [2]
+    public void testLayout3KeyAuto2M0() {
+        MoreKeysKeyboardParams params = createParams(3, 2, XPOS_M0);
+        assertEquals("3 key auto 2 M0 columns", 2, params.mNumColumns);
+        assertEquals("3 key auto 2 M0 rows", 2, params.mNumRows);
+        assertEquals("3 key auto 2 M0 left", 0, params.mLeftKeys);
+        assertEquals("3 key auto 2 M0 right", 2, params.mRightKeys);
+        assertEquals("3 key auto 2 M0 <1>", 0, params.getColumnPos(0));
+        assertEquals("3 key auto 2 M0 [2]", 1, params.getColumnPos(1));
+        assertEquals("3 key auto 2 M0 [3]", 0, params.getColumnPos(2));
+        assertEquals("3 key auto 2 M0 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("3 key auto 2 M0 default", WIDTH * 0, params.getDefaultKeyCoordX());
+    }
+
+    // |[3]
+    // |<1> [2]
+    public void testLayout3KeyAuto2L0() {
+        MoreKeysKeyboardParams params = createParams(3, 2, XPOS_L0);
+        assertEquals("3 key auto 2 L0 columns", 2, params.mNumColumns);
+        assertEquals("3 key auto 2 L0 rows", 2, params.mNumRows);
+        assertEquals("3 key auto 2 L0 left", 0, params.mLeftKeys);
+        assertEquals("3 key auto 2 L0 right", 2, params.mRightKeys);
+        assertEquals("3 key auto 2 L0 <1>", 0, params.getColumnPos(0));
+        assertEquals("3 key auto 2 L0 [2]", 1, params.getColumnPos(1));
+        assertEquals("3 key auto 2 L0 [3]", 0, params.getColumnPos(2));
+        assertEquals("3 key auto 2 L0 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("3 key auto 2 L0 default", WIDTH * 0, params.getDefaultKeyCoordX());
+    }
+
+    // |___ [3]
+    // |___ <1> [2]
+    public void testLayout3KeyAuto2L1() {
+        MoreKeysKeyboardParams params = createParams(3, 2, XPOS_L1);
+        assertEquals("3 key auto 2 L1 columns", 2, params.mNumColumns);
+        assertEquals("3 key auto 2 L1 rows", 2, params.mNumRows);
+        assertEquals("3 key auto 2 L1 left", 0, params.mLeftKeys);
+        assertEquals("3 key auto 2 L1 right", 2, params.mRightKeys);
+        assertEquals("3 key auto 2 L1 <1>", 0, params.getColumnPos(0));
+        assertEquals("3 key auto 2 L1 [2]", 1, params.getColumnPos(1));
+        assertEquals("3 key auto 2 L1 [3]", 0, params.getColumnPos(2));
+        assertEquals("3 key auto 2 L1 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("3 key auto 2 L1 default", WIDTH * 0, params.getDefaultKeyCoordX());
+    }
+
+    // |        [3]
+    // |___ ___ <1> [2]
+    public void testLayout3KeyAuto2L2() {
+        MoreKeysKeyboardParams params = createParams(3, 2, XPOS_L2);
+        assertEquals("3 key auto 2 L2 columns", 2, params.mNumColumns);
+        assertEquals("3 key auto 2 L2 rows", 2, params.mNumRows);
+        assertEquals("3 key auto 2 L2 left", 0, params.mLeftKeys);
+        assertEquals("3 key auto 2 L2 right", 2, params.mRightKeys);
+        assertEquals("3 key auto 2 L2 <1>", 0, params.getColumnPos(0));
+        assertEquals("3 key auto 2 L2 [2]", 1, params.getColumnPos(1));
+        assertEquals("3 key auto 2 L2 [3]", 0, params.getColumnPos(2));
+        assertEquals("3 key auto 2 L2 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("3 key auto 2 L2 default", WIDTH * 0, params.getDefaultKeyCoordX());
+    }
+
+    //     [3]|
+    // [2] <1>|
+    public void testLayout3KeyAuto2R0() {
+        MoreKeysKeyboardParams params = createParams(3, 2, XPOS_R0);
+        assertEquals("3 key auto 2 R0 columns", 2, params.mNumColumns);
+        assertEquals("3 key auto 2 R0 rows", 2, params.mNumRows);
+        assertEquals("3 key auto 2 R0 left", 1, params.mLeftKeys);
+        assertEquals("3 key auto 2 R0 right", 1, params.mRightKeys);
+        assertEquals("3 key auto 2 R0 <1>", 0, params.getColumnPos(0));
+        assertEquals("3 key auto 2 R0 [2]", -1, params.getColumnPos(1));
+        assertEquals("3 key auto 2 R0 [3]", 0, params.getColumnPos(2));
+        assertEquals("3 key auto 2 R0 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("3 key auto 2 R0 default", WIDTH * 1, params.getDefaultKeyCoordX());
+    }
+
+    //     [3]    |
+    // [2] <1> ___|
+    public void testLayout3KeyAuto2R1() {
+        MoreKeysKeyboardParams params = createParams(3, 2, XPOS_R1);
+        assertEquals("3 key auto 2 R1 columns", 2, params.mNumColumns);
+        assertEquals("3 key auto 2 R1 rows", 2, params.mNumRows);
+        assertEquals("3 key auto 2 R1 left", 1, params.mLeftKeys);
+        assertEquals("3 key auto 2 R1 right", 1, params.mRightKeys);
+        assertEquals("3 key auto 2 R1 <1>", 0, params.getColumnPos(0));
+        assertEquals("3 key auto 2 R1 [2]", -1, params.getColumnPos(1));
+        assertEquals("3 key auto 2 R1 [3]", 0, params.getColumnPos(2));
+        assertEquals("3 key auto 2 R1 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("3 key auto 2 R1 default", WIDTH * 1, params.getDefaultKeyCoordX());
+    }
+
+    // [3]        |
+    // <1> [2] ___|
+    public void testLayout3KeyAuto2R2() {
+        MoreKeysKeyboardParams params = createParams(3, 2, XPOS_R2);
+        assertEquals("3 key auto 2 R2 columns", 2, params.mNumColumns);
+        assertEquals("3 key auto 2 R2 rows", 2, params.mNumRows);
+        assertEquals("3 key auto 2 R2 left", 0, params.mLeftKeys);
+        assertEquals("3 key auto 2 R2 right", 2, params.mRightKeys);
+        assertEquals("3 key auto 2 R2 <1>", 0, params.getColumnPos(0));
+        assertEquals("3 key auto 2 R2 [2]", 1, params.getColumnPos(1));
+        assertEquals("3 key auto 2 R2 [3]", 0, params.getColumnPos(2));
+        assertEquals("3 key auto 2 R2 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("3 key auto 2 R2 default", WIDTH * 0, params.getDefaultKeyCoordX());
+    }
+
+    //     [4]
+    // [3] <1> [2]
+    public void testLayout4KeyAuto3M0() {
+        MoreKeysKeyboardParams params = createParams(4, 3, XPOS_M0);
+        assertEquals("4 key auto 3 M0 columns", 3, params.mNumColumns);
+        assertEquals("4 key auto 3 M0 rows", 2, params.mNumRows);
+        assertEquals("4 key auto 3 M0 left", 1, params.mLeftKeys);
+        assertEquals("4 key auto 3 M0 right", 2, params.mRightKeys);
+        assertEquals("4 key auto 3 M0 <1>", 0, params.getColumnPos(0));
+        assertEquals("4 key auto 3 M0 [2]", 1, params.getColumnPos(1));
+        assertEquals("4 key auto 3 M0 [3]", -1, params.getColumnPos(2));
+        assertEquals("4 key auto 3 M0 [4]", 0, params.getColumnPos(3));
+        assertEquals("4 key auto 3 M0 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("4 key auto 3 M0 default", WIDTH * 1, params.getDefaultKeyCoordX());
+    }
+
+    // |[4]
+    // |<1> [2] [3]
+    public void testLayout4KeyAuto3L0() {
+        MoreKeysKeyboardParams params = createParams(4, 3, XPOS_L0);
+        assertEquals("4 key auto 3 L0 columns", 3, params.mNumColumns);
+        assertEquals("4 key auto 3 L0 rows", 2, params.mNumRows);
+        assertEquals("4 key auto 3 L0 left", 0, params.mLeftKeys);
+        assertEquals("4 key auto 3 L0 right", 3, params.mRightKeys);
+        assertEquals("4 key auto 3 L0 <1>", 0, params.getColumnPos(0));
+        assertEquals("4 key auto 3 L0 [2]", 1, params.getColumnPos(1));
+        assertEquals("4 key auto 3 L0 [3]", 2, params.getColumnPos(2));
+        assertEquals("4 key auto 3 L0 [4]", 0, params.getColumnPos(3));
+        assertEquals("4 key auto 3 L0 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("4 key auto 3 L0 default", WIDTH * 0, params.getDefaultKeyCoordX());
+    }
+
+    // |___ [4]
+    // |___ <1> [2] [3]
+    public void testLayout4KeyAuto3L1() {
+        MoreKeysKeyboardParams params = createParams(4, 3, XPOS_L1);
+        assertEquals("4 key auto 3 L1 columns", 3, params.mNumColumns);
+        assertEquals("4 key auto 3 L1 rows", 2, params.mNumRows);
+        assertEquals("4 key auto 3 L1 left", 0, params.mLeftKeys);
+        assertEquals("4 key auto 3 L1 right", 3, params.mRightKeys);
+        assertEquals("4 key auto 3 L1 <1>", 0, params.getColumnPos(0));
+        assertEquals("4 key auto 3 L1 [2]", 1, params.getColumnPos(1));
+        assertEquals("4 key auto 3 L1 [3]", 2, params.getColumnPos(2));
+        assertEquals("4 key auto 3 L1 [4]", 0, params.getColumnPos(3));
+        assertEquals("4 key auto 3 L1 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("4 key auto 3 L1 default", WIDTH * 0, params.getDefaultKeyCoordX());
+    }
+
+    // |___ ___ [4]
+    // |___ [3] <1> [2]
+    public void testLayout4KeyAuto3L2() {
+        MoreKeysKeyboardParams params = createParams(4, 3, XPOS_L2);
+        assertEquals("4 key auto 3 L2 columns", 3, params.mNumColumns);
+        assertEquals("4 key auto 3 L2 rows", 2, params.mNumRows);
+        assertEquals("4 key auto 3 L2 left", 1, params.mLeftKeys);
+        assertEquals("4 key auto 3 L2 right", 2, params.mRightKeys);
+        assertEquals("4 key auto 3 L2 <1>", 0, params.getColumnPos(0));
+        assertEquals("4 key auto 3 L2 [2]", 1, params.getColumnPos(1));
+        assertEquals("4 key auto 3 L2 [3]", -1, params.getColumnPos(2));
+        assertEquals("4 key auto 3 L2 [4]", 0, params.getColumnPos(3));
+        assertEquals("4 key auto 3 L2 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("4 key auto 3 L2 default", WIDTH * 1, params.getDefaultKeyCoordX());
+    }
+
+    //         [4]|
+    // [3] [2] <1>|
+    public void testLayout4KeyAuto3R0() {
+        MoreKeysKeyboardParams params = createParams(4, 3, XPOS_R0);
+        assertEquals("4 key auto 3 R0 columns", 3, params.mNumColumns);
+        assertEquals("4 key auto 3 R0 rows", 2, params.mNumRows);
+        assertEquals("4 key auto 3 R0 left", 2, params.mLeftKeys);
+        assertEquals("4 key auto 3 R0 right", 1, params.mRightKeys);
+        assertEquals("4 key auto 3 R0 <1>", 0, params.getColumnPos(0));
+        assertEquals("4 key auto 3 R0 [2]", -1, params.getColumnPos(1));
+        assertEquals("4 key auto 3 R0 [3]", -2, params.getColumnPos(2));
+        assertEquals("4 key auto 3 R0 [4]", 0, params.getColumnPos(3));
+        assertEquals("4 key auto 3 R0 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("4 key auto 3 R0 default", WIDTH * 2, params.getDefaultKeyCoordX());
+    }
+
+    //         [4] ___|
+    // [3] [2] <1> ___|
+    public void testLayout4KeyAuto3R1() {
+        MoreKeysKeyboardParams params = createParams(4, 3, XPOS_R1);
+        assertEquals("4 key auto 3 R1 columns", 3, params.mNumColumns);
+        assertEquals("4 key auto 3 R1 rows", 2, params.mNumRows);
+        assertEquals("4 key auto 3 R1 left", 2, params.mLeftKeys);
+        assertEquals("4 key auto 3 R1 right", 1, params.mRightKeys);
+        assertEquals("4 key auto 3 R1 <1>", 0, params.getColumnPos(0));
+        assertEquals("4 key auto 3 R1 [2]", -1, params.getColumnPos(1));
+        assertEquals("4 key auto 3 R1 [3]", -2, params.getColumnPos(2));
+        assertEquals("4 key auto 3 R1 [4]", 0, params.getColumnPos(3));
+        assertEquals("4 key auto 3 R1 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("4 key auto 3 R1 default", WIDTH * 2, params.getDefaultKeyCoordX());
+    }
+
+    //     [4]     ___|
+    // [3] <1> [2] ___|
+    public void testLayout4KeyAuto3R2() {
+        MoreKeysKeyboardParams params = createParams(4, 3, XPOS_R2);
+        assertEquals("4 key auto 3 R2 columns", 3, params.mNumColumns);
+        assertEquals("4 key auto 3 R2 rows", 2, params.mNumRows);
+        assertEquals("4 key auto 3 R2 left", 1, params.mLeftKeys);
+        assertEquals("4 key auto 3 R2 right", 2, params.mRightKeys);
+        assertEquals("4 key auto 3 R2 <1>", 0, params.getColumnPos(0));
+        assertEquals("4 key auto 3 R2 [2]", 1, params.getColumnPos(1));
+        assertEquals("4 key auto 3 R2 [3]", -1, params.getColumnPos(2));
+        assertEquals("4 key auto 3 R2 [4]", 0, params.getColumnPos(3));
+        assertEquals("4 key auto 3 R2 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("4 key auto 3 R2 default", WIDTH * 1, params.getDefaultKeyCoordX());
+    }
+
+    // [3] <1> [2] [4]
+    public void testLayout4KeyAuto4M0() {
+        MoreKeysKeyboardParams params = createParams(4, 4, XPOS_M0);
+        assertEquals("4 key auto 4 M0 columns", 4, params.mNumColumns);
+        assertEquals("4 key auto 4 M0 rows", 1, params.mNumRows);
+        assertEquals("4 key auto 4 M0 left", 1, params.mLeftKeys);
+        assertEquals("4 key auto 4 M0 right", 3, params.mRightKeys);
+        assertEquals("4 key auto 4 M0 <1>", 0, params.getColumnPos(0));
+        assertEquals("4 key auto 4 M0 [2]", 1, params.getColumnPos(1));
+        assertEquals("4 key auto 4 M0 [3]", -1, params.getColumnPos(2));
+        assertEquals("4 key auto 4 M0 [4]", 2, params.getColumnPos(3));
+        assertEquals("4 key auto 4 M0 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("4 key auto 4 M0 default", WIDTH * 1, params.getDefaultKeyCoordX());
+    }
+
+    // |<1> [2] [3] [4]
+    public void testLayout4KeyAuto4L0() {
+        MoreKeysKeyboardParams params = createParams(4, 4, XPOS_L0);
+        assertEquals("4 key auto 4 L0 columns", 4, params.mNumColumns);
+        assertEquals("4 key auto 4 L0 rows", 1, params.mNumRows);
+        assertEquals("4 key auto 4 L0 left", 0, params.mLeftKeys);
+        assertEquals("4 key auto 4 L0 right", 4, params.mRightKeys);
+        assertEquals("4 key auto 4 L0 <1>", 0, params.getColumnPos(0));
+        assertEquals("4 key auto 4 L0 [2]", 1, params.getColumnPos(1));
+        assertEquals("4 key auto 4 L0 [3]", 2, params.getColumnPos(2));
+        assertEquals("4 key auto 4 L0 [4]", 3, params.getColumnPos(3));
+        assertEquals("4 key auto 4 L0 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("4 key auto 4 L0 default", WIDTH * 0, params.getDefaultKeyCoordX());
+    }
+
+    // |___ <1> [2] [3] [4]
+    public void testLayout4KeyAuto4L1() {
+        MoreKeysKeyboardParams params = createParams(4, 4, XPOS_L1);
+        assertEquals("4 key auto 4 L1 columns", 4, params.mNumColumns);
+        assertEquals("4 key auto 4 L1 rows", 1, params.mNumRows);
+        assertEquals("4 key auto 4 L1 left", 0, params.mLeftKeys);
+        assertEquals("4 key auto 4 L1 right", 4, params.mRightKeys);
+        assertEquals("4 key auto 4 L1 <1>", 0, params.getColumnPos(0));
+        assertEquals("4 key auto 4 L1 [2]", 1, params.getColumnPos(1));
+        assertEquals("4 key auto 4 L1 [3]", 2, params.getColumnPos(2));
+        assertEquals("4 key auto 4 L1 [4]", 3, params.getColumnPos(3));
+        assertEquals("4 key auto 4 L1 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("4 key auto 4 L1 default", WIDTH * 0, params.getDefaultKeyCoordX());
+    }
+
+    // |___ [3] <1> [2] [4]
+    public void testLayout4KeyAuto4L2() {
+        MoreKeysKeyboardParams params = createParams(4, 4, XPOS_L2);
+        assertEquals("4 key auto 4 L2 columns", 4, params.mNumColumns);
+        assertEquals("4 key auto 4 L2 rows", 1, params.mNumRows);
+        assertEquals("4 key auto 4 L2 left", 1, params.mLeftKeys);
+        assertEquals("4 key auto 4 L2 right", 3, params.mRightKeys);
+        assertEquals("4 key auto 4 L2 <1>", 0, params.getColumnPos(0));
+        assertEquals("4 key auto 4 L2 [2]", 1, params.getColumnPos(1));
+        assertEquals("4 key auto 4 L2 [3]", -1, params.getColumnPos(2));
+        assertEquals("4 key auto 4 L2 [4]", 2, params.getColumnPos(3));
+        assertEquals("4 key auto 4 L2 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("4 key auto 4 L2 default", WIDTH * 1, params.getDefaultKeyCoordX());
+    }
+
+    // [4] [3] [2] <1>|
+    public void testLayout4KeyAuto4R0() {
+        MoreKeysKeyboardParams params = createParams(4, 4, XPOS_R0);
+        assertEquals("4 key auto 4 R0 columns", 4, params.mNumColumns);
+        assertEquals("4 key auto 4 R0 rows", 1, params.mNumRows);
+        assertEquals("4 key auto 4 R0 left", 3, params.mLeftKeys);
+        assertEquals("4 key auto 4 R0 right", 1, params.mRightKeys);
+        assertEquals("4 key auto 4 R0 <1>", 0, params.getColumnPos(0));
+        assertEquals("4 key auto 4 R0 [2]", -1, params.getColumnPos(1));
+        assertEquals("4 key auto 4 R0 [3]", -2, params.getColumnPos(2));
+        assertEquals("4 key auto 4 R0 [4]", -3, params.getColumnPos(3));
+        assertEquals("4 key auto 4 R0 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("4 key auto 4 R0 default", WIDTH * 3, params.getDefaultKeyCoordX());
+    }
+
+    // [4] [3] [2] <1> ___|
+    public void testLayout4KeyAuto4R1() {
+        MoreKeysKeyboardParams params = createParams(4, 4, XPOS_R1);
+        assertEquals("4 key auto 4 R1 columns", 4, params.mNumColumns);
+        assertEquals("4 key auto 4 R1 rows", 1, params.mNumRows);
+        assertEquals("4 key auto 4 R1 left", 3, params.mLeftKeys);
+        assertEquals("4 key auto 4 R1 right", 1, params.mRightKeys);
+        assertEquals("4 key auto 4 R1 <1>", 0, params.getColumnPos(0));
+        assertEquals("4 key auto 4 R1 [2]", -1, params.getColumnPos(1));
+        assertEquals("4 key auto 4 R1 [3]", -2, params.getColumnPos(2));
+        assertEquals("4 key auto 4 R1 [4]", -3, params.getColumnPos(3));
+        assertEquals("4 key auto 4 R1 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("4 key auto 4 R1 default", WIDTH * 3, params.getDefaultKeyCoordX());
+    }
+
+    // [4] [3] <1> [2] ___|
+    public void testLayout4KeyAuto4R2() {
+        MoreKeysKeyboardParams params = createParams(4, 4, XPOS_R2);
+        assertEquals("4 key auto 4 R2 columns", 4, params.mNumColumns);
+        assertEquals("4 key auto 4 R2 rows", 1, params.mNumRows);
+        assertEquals("4 key auto 4 R2 left", 2, params.mLeftKeys);
+        assertEquals("4 key auto 4 R2 right", 2, params.mRightKeys);
+        assertEquals("4 key auto 4 R2 <1>", 0, params.getColumnPos(0));
+        assertEquals("4 key auto 4 R2 [2]", 1, params.getColumnPos(1));
+        assertEquals("4 key auto 4 R2 [3]", -1, params.getColumnPos(2));
+        assertEquals("4 key auto 4 R2 [4]", -2, params.getColumnPos(3));
+        assertEquals("4 key auto 4 R2 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("4 key auto 4 R2 default", WIDTH * 2, params.getDefaultKeyCoordX());
+    }
+
+    // [3] <1> [2] [4]
+    public void testLayout4KeyAuto5M0() {
+        MoreKeysKeyboardParams params = createParams(4, 5, XPOS_M0);
+        assertEquals("4 key auto 5 M0 columns", 4, params.mNumColumns);
+        assertEquals("4 key auto 5 M0 rows", 1, params.mNumRows);
+        assertEquals("4 key auto 5 M0 left", 1, params.mLeftKeys);
+        assertEquals("4 key auto 5 M0 right", 3, params.mRightKeys);
+        assertEquals("4 key auto 5 M0 <1>", 0, params.getColumnPos(0));
+        assertEquals("4 key auto 5 M0 [2]", 1, params.getColumnPos(1));
+        assertEquals("4 key auto 5 M0 [3]", -1, params.getColumnPos(2));
+        assertEquals("4 key auto 5 M0 [4]", 2, params.getColumnPos(3));
+        assertEquals("4 key auto 5 M0 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("4 key auto 5 M0 default", WIDTH * 1, params.getDefaultKeyCoordX());
+    }
+
+    // |<1> [2] [3] [4]
+    public void testLayout4KeyAuto5L0() {
+        MoreKeysKeyboardParams params = createParams(4, 5, XPOS_L0);
+        assertEquals("4 key auto 5 L0 columns", 4, params.mNumColumns);
+        assertEquals("4 key auto 5 L0 rows", 1, params.mNumRows);
+        assertEquals("4 key auto 5 L0 left", 0, params.mLeftKeys);
+        assertEquals("4 key auto 5 L0 right", 4, params.mRightKeys);
+        assertEquals("4 key auto 5 L0 <1>", 0, params.getColumnPos(0));
+        assertEquals("4 key auto 5 L0 [2]", 1, params.getColumnPos(1));
+        assertEquals("4 key auto 5 L0 [3]", 2, params.getColumnPos(2));
+        assertEquals("4 key auto 5 L0 [4]", 3, params.getColumnPos(3));
+        assertEquals("4 key auto 5 L0 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("4 key auto 5 L0 default", WIDTH * 0, params.getDefaultKeyCoordX());
+    }
+
+    // |___ <1> [2] [3] [4]
+    public void testLayout4KeyAuto5L1() {
+        MoreKeysKeyboardParams params = createParams(4, 5, XPOS_L1);
+        assertEquals("4 key auto 5 L1 columns", 4, params.mNumColumns);
+        assertEquals("4 key auto 5 L1 rows", 1, params.mNumRows);
+        assertEquals("4 key auto 5 L1 left", 0, params.mLeftKeys);
+        assertEquals("4 key auto 5 L1 right", 4, params.mRightKeys);
+        assertEquals("4 key auto 5 L1 <1>", 0, params.getColumnPos(0));
+        assertEquals("4 key auto 5 L1 [2]", 1, params.getColumnPos(1));
+        assertEquals("4 key auto 5 L1 [3]", 2, params.getColumnPos(2));
+        assertEquals("4 key auto 5 L1 [4]", 3, params.getColumnPos(3));
+        assertEquals("4 key auto 5 L1 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("4 key auto 5 L1 default", WIDTH * 0, params.getDefaultKeyCoordX());
+    }
+
+    // |___ [3] <1> [2] [4]
+    public void testLayout4KeyAuto5L2() {
+        MoreKeysKeyboardParams params = createParams(4, 5, XPOS_L2);
+        assertEquals("4 key auto 5 L2 columns", 4, params.mNumColumns);
+        assertEquals("4 key auto 5 L2 rows", 1, params.mNumRows);
+        assertEquals("4 key auto 5 L2 left", 1, params.mLeftKeys);
+        assertEquals("4 key auto 5 L2 right", 3, params.mRightKeys);
+        assertEquals("4 key auto 5 L2 <1>", 0, params.getColumnPos(0));
+        assertEquals("4 key auto 5 L2 [2]", 1, params.getColumnPos(1));
+        assertEquals("4 key auto 5 L2 [3]", -1, params.getColumnPos(2));
+        assertEquals("4 key auto 5 L2 [4]", 2, params.getColumnPos(3));
+        assertEquals("4 key auto 5 L2 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("4 key auto 5 L2 default", WIDTH * 1, params.getDefaultKeyCoordX());
+    }
+
+    // [4] [3] [2] <1>|
+    public void testLayout4KeyAuto5R0() {
+        MoreKeysKeyboardParams params = createParams(4, 5, XPOS_R0);
+        assertEquals("4 key auto 5 R0 columns", 4, params.mNumColumns);
+        assertEquals("4 key auto 5 R0 rows", 1, params.mNumRows);
+        assertEquals("4 key auto 5 R0 left", 3, params.mLeftKeys);
+        assertEquals("4 key auto 5 R0 right", 1, params.mRightKeys);
+        assertEquals("4 key auto 5 R0 <1>", 0, params.getColumnPos(0));
+        assertEquals("4 key auto 5 R0 [2]", -1, params.getColumnPos(1));
+        assertEquals("4 key auto 5 R0 [3]", -2, params.getColumnPos(2));
+        assertEquals("4 key auto 5 R0 [4]", -3, params.getColumnPos(3));
+        assertEquals("4 key auto 5 R0 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("4 key auto 5 R0 default", WIDTH * 3, params.getDefaultKeyCoordX());
+    }
+
+    // [4] [3] [2] <1> ___|
+    public void testLayout4KeyAuto5R1() {
+        MoreKeysKeyboardParams params = createParams(4, 5, XPOS_R1);
+        assertEquals("4 key auto 5 R1 columns", 4, params.mNumColumns);
+        assertEquals("4 key auto 5 R1 rows", 1, params.mNumRows);
+        assertEquals("4 key auto 5 R1 left", 3, params.mLeftKeys);
+        assertEquals("4 key auto 5 R1 right", 1, params.mRightKeys);
+        assertEquals("4 key auto 5 R1 <1>", 0, params.getColumnPos(0));
+        assertEquals("4 key auto 5 R1 [2]", -1, params.getColumnPos(1));
+        assertEquals("4 key auto 5 R1 [3]", -2, params.getColumnPos(2));
+        assertEquals("4 key auto 5 R1 [4]", -3, params.getColumnPos(3));
+        assertEquals("4 key auto 5 R1 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("4 key auto 5 R1 default", WIDTH * 3, params.getDefaultKeyCoordX());
+    }
+
+    // [4] [3] <1> [2] ___|
+    public void testLayout4KeyAuto5R2() {
+        MoreKeysKeyboardParams params = createParams(4, 5, XPOS_R2);
+        assertEquals("4 key auto 5 R2 columns", 4, params.mNumColumns);
+        assertEquals("4 key auto 5 R2 rows", 1, params.mNumRows);
+        assertEquals("4 key auto 5 R2 left", 2, params.mLeftKeys);
+        assertEquals("4 key auto 5 R2 right", 2, params.mRightKeys);
+        assertEquals("4 key auto 5 R2 <1>", 0, params.getColumnPos(0));
+        assertEquals("4 key auto 5 R2 [2]", 1, params.getColumnPos(1));
+        assertEquals("4 key auto 5 R2 [3]", -1, params.getColumnPos(2));
+        assertEquals("4 key auto 5 R2 [4]", -2, params.getColumnPos(3));
+        assertEquals("4 key auto 5 R2 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("4 key auto 5 R2 default", WIDTH * 2, params.getDefaultKeyCoordX());
+    }
+
+    //   [4] [5]
+    // [3] <1> [2]
+    public void testLayout5KeyAuto3M0() {
+        MoreKeysKeyboardParams params = createParams(5, 3, XPOS_M0);
+        assertEquals("5 key auto 3 M0 columns", 3, params.mNumColumns);
+        assertEquals("5 key auto 3 M0 rows", 2, params.mNumRows);
+        assertEquals("5 key auto 3 M0 left", 1, params.mLeftKeys);
+        assertEquals("5 key auto 3 M0 right", 2, params.mRightKeys);
+        assertEquals("5 key auto 3 M0 <1>", 0, params.getColumnPos(0));
+        assertEquals("5 key auto 3 M0 [2]", 1, params.getColumnPos(1));
+        assertEquals("5 key auto 3 M0 [3]", -1, params.getColumnPos(2));
+        assertEquals("5 key auto 3 M0 [4]", 0, params.getColumnPos(3));
+        assertEquals("5 key auto 3 M0 [5]", 1, params.getColumnPos(4));
+        assertEquals("5 key auto 3 M0 adjust", -1, params.mTopRowAdjustment);
+        assertEquals("5 key auto 3 M0 default", WIDTH * 1, params.getDefaultKeyCoordX());
+    }
+
+    // |[4] [5]
+    // |<1> [2] [3]
+    public void testLayout5KeyAuto3L0() {
+        MoreKeysKeyboardParams params = createParams(5, 3, XPOS_L0);
+        assertEquals("5 key auto 3 L0 columns", 3, params.mNumColumns);
+        assertEquals("5 key auto 3 L0 rows", 2, params.mNumRows);
+        assertEquals("5 key auto 3 L0 left", 0, params.mLeftKeys);
+        assertEquals("5 key auto 3 L0 right", 3, params.mRightKeys);
+        assertEquals("5 key auto 3 L0 <1>", 0, params.getColumnPos(0));
+        assertEquals("5 key auto 3 L0 [2]", 1, params.getColumnPos(1));
+        assertEquals("5 key auto 3 L0 [3]", 2, params.getColumnPos(2));
+        assertEquals("5 key auto 3 L0 [4]", 0, params.getColumnPos(3));
+        assertEquals("5 key auto 3 L0 [5]", 1, params.getColumnPos(4));
+        assertEquals("5 key auto 3 L0 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("5 key auto 3 L0 default", WIDTH * 0, params.getDefaultKeyCoordX());
+    }
+
+    // |___ [4] [5]
+    // |___ <1> [2] [3]
+    public void testLayout5KeyAuto3L1() {
+        MoreKeysKeyboardParams params = createParams(5, 3, XPOS_L1);
+        assertEquals("5 key auto 3 L1 columns", 3, params.mNumColumns);
+        assertEquals("5 key auto 3 L1 rows", 2, params.mNumRows);
+        assertEquals("5 key auto 3 L1 left", 0, params.mLeftKeys);
+        assertEquals("5 key auto 3 L1 right", 3, params.mRightKeys);
+        assertEquals("5 key auto 3 L1 <1>", 0, params.getColumnPos(0));
+        assertEquals("5 key auto 3 L1 [2]", 1, params.getColumnPos(1));
+        assertEquals("5 key auto 3 L1 [3]", 2, params.getColumnPos(2));
+        assertEquals("5 key auto 3 L1 [4]", 0, params.getColumnPos(3));
+        assertEquals("5 key auto 3 L1 [5]", 1, params.getColumnPos(4));
+        assertEquals("5 key auto 3 L1 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("5 key auto 3 L1 default", WIDTH * 0, params.getDefaultKeyCoordX());
+    }
+
+    // |___   [4] [5]
+    // |___ [3] <1> [2]
+    public void testLayout5KeyAuto3L2() {
+        MoreKeysKeyboardParams params = createParams(5, 3, XPOS_L2);
+        assertEquals("5 key auto 3 L2 columns", 3, params.mNumColumns);
+        assertEquals("5 key auto 3 L2 rows", 2, params.mNumRows);
+        assertEquals("5 key auto 3 L2 left", 1, params.mLeftKeys);
+        assertEquals("5 key auto 3 L2 right", 2, params.mRightKeys);
+        assertEquals("5 key auto 3 L2 <1>", 0, params.getColumnPos(0));
+        assertEquals("5 key auto 3 L2 [2]", 1, params.getColumnPos(1));
+        assertEquals("5 key auto 3 L2 [3]", -1, params.getColumnPos(2));
+        assertEquals("5 key auto 3 L2 [4]", 0, params.getColumnPos(3));
+        assertEquals("5 key auto 3 L2 [5]", 1, params.getColumnPos(4));
+        assertEquals("5 key auto 3 L2 adjust", -1, params.mTopRowAdjustment);
+        assertEquals("5 key auto 3 L2 default", WIDTH * 1, params.getDefaultKeyCoordX());
+    }
+
+    //     [5] [4]|
+    // [3] [2] <1>|
+    public void testLayout5KeyAuto3R0() {
+        MoreKeysKeyboardParams params = createParams(5, 3, XPOS_R0);
+        assertEquals("5 key auto 3 R0 columns", 3, params.mNumColumns);
+        assertEquals("5 key auto 3 R0 rows", 2, params.mNumRows);
+        assertEquals("5 key auto 3 R0 left", 2, params.mLeftKeys);
+        assertEquals("5 key auto 3 R0 right", 1, params.mRightKeys);
+        assertEquals("5 key auto 3 R0 <1>", 0, params.getColumnPos(0));
+        assertEquals("5 key auto 3 R0 [2]", -1, params.getColumnPos(1));
+        assertEquals("5 key auto 3 R0 [3]", -2, params.getColumnPos(2));
+        assertEquals("5 key auto 3 R0 [4]", 0, params.getColumnPos(3));
+        assertEquals("5 key auto 3 R0 [5]", -1, params.getColumnPos(4));
+        assertEquals("5 key auto 3 R0 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("5 key auto 3 R0 default", WIDTH * 2, params.getDefaultKeyCoordX());
+    }
+
+    //     [5] [4] ___|
+    // [3] [2] <1> ___|
+    public void testLayout5KeyAuto3R1() {
+        MoreKeysKeyboardParams params = createParams(5, 3, XPOS_R1);
+        assertEquals("5 key auto 3 R1 columns", 3, params.mNumColumns);
+        assertEquals("5 key auto 3 R1 rows", 2, params.mNumRows);
+        assertEquals("5 key auto 3 R1 left", 2, params.mLeftKeys);
+        assertEquals("5 key auto 3 R1 right", 1, params.mRightKeys);
+        assertEquals("5 key auto 3 R1 <1>", 0, params.getColumnPos(0));
+        assertEquals("5 key auto 3 R1 [2]", -1, params.getColumnPos(1));
+        assertEquals("5 key auto 3 R1 [3]", -2, params.getColumnPos(2));
+        assertEquals("5 key auto 3 R1 [4]", 0, params.getColumnPos(3));
+        assertEquals("5 key auto 3 R1 [5]", -1, params.getColumnPos(4));
+        assertEquals("5 key auto 3 R1 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("5 key auto 3 R1 default", WIDTH * 2, params.getDefaultKeyCoordX());
+    }
+
+    //   [4] [5]   ___|
+    // [3] <1> [2] ___|
+    public void testLayout5KeyAuto3R2() {
+        MoreKeysKeyboardParams params = createParams(5, 3, XPOS_R2);
+        assertEquals("5 key auto 3 R2 columns", 3, params.mNumColumns);
+        assertEquals("5 key auto 3 R2 rows", 2, params.mNumRows);
+        assertEquals("5 key auto 3 R2 left", 1, params.mLeftKeys);
+        assertEquals("5 key auto 3 R2 right", 2, params.mRightKeys);
+        assertEquals("5 key auto 3 R2 <1>", 0, params.getColumnPos(0));
+        assertEquals("5 key auto 3 R2 [2]", 1, params.getColumnPos(1));
+        assertEquals("5 key auto 3 R2 [3]", -1, params.getColumnPos(2));
+        assertEquals("5 key auto 3 R2 [4]", 0, params.getColumnPos(3));
+        assertEquals("5 key auto 3 R2 [5]", 1, params.getColumnPos(4));
+        assertEquals("5 key auto 3 R2 adjust", -1, params.mTopRowAdjustment);
+        assertEquals("5 key auto 3 R2 default", WIDTH * 1, params.getDefaultKeyCoordX());
+    }
+
+    //     [5]
+    // [3] <1> [2] [4]
+    public void testLayout5KeyAuto4M0() {
+        MoreKeysKeyboardParams params = createParams(5, 4, XPOS_M0);
+        assertEquals("5 key auto 4 M0 columns", 4, params.mNumColumns);
+        assertEquals("5 key auto 4 M0 rows", 2, params.mNumRows);
+        assertEquals("5 key auto 4 M0 left", 1, params.mLeftKeys);
+        assertEquals("5 key auto 4 M0 right", 3, params.mRightKeys);
+        assertEquals("5 key auto 4 M0 <1>", 0, params.getColumnPos(0));
+        assertEquals("5 key auto 4 M0 [2]", 1, params.getColumnPos(1));
+        assertEquals("5 key auto 4 M0 [3]", -1, params.getColumnPos(2));
+        assertEquals("5 key auto 4 M0 [4]", 2, params.getColumnPos(3));
+        assertEquals("5 key auto 4 M0 [5]", 0, params.getColumnPos(4));
+        assertEquals("5 key auto 4 M0 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("5 key auto 4 M0 default", WIDTH * 1, params.getDefaultKeyCoordX());
+    }
+
+    // |[5]
+    // |<1> [2] [3] [4]
+    public void testLayout5KeyAuto4L0() {
+        MoreKeysKeyboardParams params = createParams(5, 4, XPOS_L0);
+        assertEquals("5 key auto 4 L0 columns", 4, params.mNumColumns);
+        assertEquals("5 key auto 4 L0 rows", 2, params.mNumRows);
+        assertEquals("5 key auto 4 L0 left", 0, params.mLeftKeys);
+        assertEquals("5 key auto 4 L0 right", 4, params.mRightKeys);
+        assertEquals("5 key auto 4 L0 <1>", 0, params.getColumnPos(0));
+        assertEquals("5 key auto 4 L0 [2]", 1, params.getColumnPos(1));
+        assertEquals("5 key auto 4 L0 [3]", 2, params.getColumnPos(2));
+        assertEquals("5 key auto 4 L0 [4]", 3, params.getColumnPos(3));
+        assertEquals("5 key auto 4 L0 [5]", 0, params.getColumnPos(4));
+        assertEquals("5 key auto 4 L0 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("5 key auto 4 L0 default", WIDTH * 0, params.getDefaultKeyCoordX());
+    }
+
+    // |___ [5]
+    // |___ <1> [2] [3] [4]
+    public void testLayout5KeyAuto4L1() {
+        MoreKeysKeyboardParams params = createParams(5, 4, XPOS_L1);
+        assertEquals("5 key auto 4 L1 columns", 4, params.mNumColumns);
+        assertEquals("5 key auto 4 L1 rows", 2, params.mNumRows);
+        assertEquals("5 key auto 4 L1 left", 0, params.mLeftKeys);
+        assertEquals("5 key auto 4 L1 right", 4, params.mRightKeys);
+        assertEquals("5 key auto 4 L1 <1>", 0, params.getColumnPos(0));
+        assertEquals("5 key auto 4 L1 [2]", 1, params.getColumnPos(1));
+        assertEquals("5 key auto 4 L1 [3]", 2, params.getColumnPos(2));
+        assertEquals("5 key auto 4 L1 [4]", 3, params.getColumnPos(3));
+        assertEquals("5 key auto 4 L1 [5]", 0, params.getColumnPos(4));
+        assertEquals("5 key auto 4 L1 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("5 key auto 4 L1 default", WIDTH * 0, params.getDefaultKeyCoordX());
+    }
+
+    // |___     [5]
+    // |___ [3] <1> [2] [4]
+    public void testLayout5KeyAuto4L2() {
+        MoreKeysKeyboardParams params = createParams(5, 4, XPOS_L2);
+        assertEquals("5 key auto 4 L2 columns", 4, params.mNumColumns);
+        assertEquals("5 key auto 4 L2 rows", 2, params.mNumRows);
+        assertEquals("5 key auto 4 L2 left", 1, params.mLeftKeys);
+        assertEquals("5 key auto 4 L2 right", 3, params.mRightKeys);
+        assertEquals("5 key auto 4 L2 <1>", 0, params.getColumnPos(0));
+        assertEquals("5 key auto 4 L2 [2]", 1, params.getColumnPos(1));
+        assertEquals("5 key auto 4 L2 [3]", -1, params.getColumnPos(2));
+        assertEquals("5 key auto 4 L2 [4]", 2, params.getColumnPos(3));
+        assertEquals("5 key auto 4 L2 [5]", 0, params.getColumnPos(4));
+        assertEquals("5 key auto 4 L2 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("5 key auto 4 L2 default", WIDTH * 1, params.getDefaultKeyCoordX());
+    }
+
+    //             [5]|
+    // [4] [3] [2] <1>|
+    public void testLayout5KeyAuto4R0() {
+        MoreKeysKeyboardParams params = createParams(5, 4, XPOS_R0);
+        assertEquals("5 key auto 4 R0 columns", 4, params.mNumColumns);
+        assertEquals("5 key auto 4 R0 rows", 2, params.mNumRows);
+        assertEquals("5 key auto 4 R0 left", 3, params.mLeftKeys);
+        assertEquals("5 key auto 4 R0 right", 1, params.mRightKeys);
+        assertEquals("5 key auto 4 R0 <1>", 0, params.getColumnPos(0));
+        assertEquals("5 key auto 4 R0 [2]", -1, params.getColumnPos(1));
+        assertEquals("5 key auto 4 R0 [3]", -2, params.getColumnPos(2));
+        assertEquals("5 key auto 4 R0 [4]", -3, params.getColumnPos(3));
+        assertEquals("5 key auto 4 R0 [5]", 0, params.getColumnPos(4));
+        assertEquals("5 key auto 4 R0 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("5 key auto 4 R0 default", WIDTH * 3, params.getDefaultKeyCoordX());
+    }
+
+    //             [5] ___|
+    // [4] [3] [2] <1> ___|
+    public void testLayout5KeyAuto4R1() {
+        MoreKeysKeyboardParams params = createParams(5, 4, XPOS_R1);
+        assertEquals("5 key auto 4 R1 columns", 4, params.mNumColumns);
+        assertEquals("5 key auto 4 R1 rows", 2, params.mNumRows);
+        assertEquals("5 key auto 4 R1 left", 3, params.mLeftKeys);
+        assertEquals("5 key auto 4 R1 right", 1, params.mRightKeys);
+        assertEquals("5 key auto 4 R1 <1>", 0, params.getColumnPos(0));
+        assertEquals("5 key auto 4 R1 [2]", -1, params.getColumnPos(1));
+        assertEquals("5 key auto 4 R1 [3]", -2, params.getColumnPos(2));
+        assertEquals("5 key auto 4 R1 [4]", -3, params.getColumnPos(3));
+        assertEquals("5 key auto 4 R1 [5]", 0, params.getColumnPos(4));
+        assertEquals("5 key auto 4 R1 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("5 key auto 4 R1 default", WIDTH * 3, params.getDefaultKeyCoordX());
+    }
+
+    //         [5]     ___|
+    // [4] [3] <1> [2] ___|
+    public void testLayout5KeyAuto4R2() {
+        MoreKeysKeyboardParams params = createParams(5, 4, XPOS_R2);
+        assertEquals("5 key auto 4 R2 columns", 4, params.mNumColumns);
+        assertEquals("5 key auto 4 R2 rows", 2, params.mNumRows);
+        assertEquals("5 key auto 4 R2 left", 2, params.mLeftKeys);
+        assertEquals("5 key auto 4 R2 right", 2, params.mRightKeys);
+        assertEquals("5 key auto 4 R2 <1>", 0, params.getColumnPos(0));
+        assertEquals("5 key auto 4 R2 [2]", 1, params.getColumnPos(1));
+        assertEquals("5 key auto 4 R2 [3]", -1, params.getColumnPos(2));
+        assertEquals("5 key auto 4 R2 [4]", -2, params.getColumnPos(3));
+        assertEquals("5 key auto 4 R2 [5]", 0, params.getColumnPos(4));
+        assertEquals("5 key auto 4 R2 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("5 key auto 4 R2 default", WIDTH * 2, params.getDefaultKeyCoordX());
+    }
+
+    // [5] [3] <1> [2] [4]
+    public void testLayout5KeyAuto5M0() {
+        MoreKeysKeyboardParams params = createParams(5, 5, XPOS_M0);
+        assertEquals("5 key auto 5 M0 columns", 5, params.mNumColumns);
+        assertEquals("5 key auto 5 M0 rows", 1, params.mNumRows);
+        assertEquals("5 key auto 5 M0 left", 2, params.mLeftKeys);
+        assertEquals("5 key auto 5 M0 right", 3, params.mRightKeys);
+        assertEquals("5 key auto 5 M0 <1>", 0, params.getColumnPos(0));
+        assertEquals("5 key auto 5 M0 [2]", 1, params.getColumnPos(1));
+        assertEquals("5 key auto 5 M0 [3]", -1, params.getColumnPos(2));
+        assertEquals("5 key auto 5 M0 [4]", 2, params.getColumnPos(3));
+        assertEquals("5 key auto 5 M0 [5]", -2, params.getColumnPos(4));
+        assertEquals("5 key auto 5 M0 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("5 key auto 5 M0 default", WIDTH * 2, params.getDefaultKeyCoordX());
+    }
+
+    // |<1> [2] [3] [4] [5]
+    public void testLayout5KeyAuto5L0() {
+        MoreKeysKeyboardParams params = createParams(5, 5, XPOS_L0);
+        assertEquals("5 key auto 5 L0 columns", 5, params.mNumColumns);
+        assertEquals("5 key auto 5 L0 rows", 1, params.mNumRows);
+        assertEquals("5 key auto 5 L0 left", 0, params.mLeftKeys);
+        assertEquals("5 key auto 5 L0 right", 5, params.mRightKeys);
+        assertEquals("5 key auto 5 L0 <1>", 0, params.getColumnPos(0));
+        assertEquals("5 key auto 5 L0 [2]", 1, params.getColumnPos(1));
+        assertEquals("5 key auto 5 L0 [3]", 2, params.getColumnPos(2));
+        assertEquals("5 key auto 5 L0 [4]", 3, params.getColumnPos(3));
+        assertEquals("5 key auto 5 L0 [5]", 4, params.getColumnPos(4));
+        assertEquals("5 key auto 5 L0 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("5 key auto 5 L0 default", WIDTH * 0, params.getDefaultKeyCoordX());
+    }
+
+    // |___ <1> [2] [3] [4] [5]
+    public void testLayout5KeyAuto5L1() {
+        MoreKeysKeyboardParams params = createParams(5, 5, XPOS_L1);
+        assertEquals("5 key auto 5 L1 columns", 5, params.mNumColumns);
+        assertEquals("5 key auto 5 L1 rows", 1, params.mNumRows);
+        assertEquals("5 key auto 5 L1 left", 0, params.mLeftKeys);
+        assertEquals("5 key auto 5 L1 right", 5, params.mRightKeys);
+        assertEquals("5 key auto 5 L1 <1>", 0, params.getColumnPos(0));
+        assertEquals("5 key auto 5 L1 [2]", 1, params.getColumnPos(1));
+        assertEquals("5 key auto 5 L1 [3]", 2, params.getColumnPos(2));
+        assertEquals("5 key auto 5 L1 [4]", 3, params.getColumnPos(3));
+        assertEquals("5 key auto 5 L1 [5]", 4, params.getColumnPos(4));
+        assertEquals("5 key auto 5 L1 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("5 key auto 5 L1 default", WIDTH * 0, params.getDefaultKeyCoordX());
+    }
+
+    // |___ [3] <1> [2] [4] [5]
+    public void testLayout5KeyAuto5L2() {
+        MoreKeysKeyboardParams params = createParams(5, 5, XPOS_L2);
+        assertEquals("5 key auto 5 L2 columns", 5, params.mNumColumns);
+        assertEquals("5 key auto 5 L2 rows", 1, params.mNumRows);
+        assertEquals("5 key auto 5 L2 left", 1, params.mLeftKeys);
+        assertEquals("5 key auto 5 L2 right", 4, params.mRightKeys);
+        assertEquals("5 key auto 5 L2 <1>", 0, params.getColumnPos(0));
+        assertEquals("5 key auto 5 L2 [2]", 1, params.getColumnPos(1));
+        assertEquals("5 key auto 5 L2 [3]", -1, params.getColumnPos(2));
+        assertEquals("5 key auto 5 L2 [4]", 2, params.getColumnPos(3));
+        assertEquals("5 key auto 5 L2 [5]", 3, params.getColumnPos(4));
+        assertEquals("5 key auto 5 L2 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("5 key auto 5 L2 default", WIDTH * 1, params.getDefaultKeyCoordX());
+    }
+
+    // [5] [4] [3] [2] <1>|
+    public void testLayout5KeyAuto5R0() {
+        MoreKeysKeyboardParams params = createParams(5, 5, XPOS_R0);
+        assertEquals("5 key auto 5 R0 columns", 5, params.mNumColumns);
+        assertEquals("5 key auto 5 R0 rows", 1, params.mNumRows);
+        assertEquals("5 key auto 5 R0 left", 4, params.mLeftKeys);
+        assertEquals("5 key auto 5 R0 right", 1, params.mRightKeys);
+        assertEquals("5 key auto 5 R0 <1>", 0, params.getColumnPos(0));
+        assertEquals("5 key auto 5 R0 [2]", -1, params.getColumnPos(1));
+        assertEquals("5 key auto 5 R0 [3]", -2, params.getColumnPos(2));
+        assertEquals("5 key auto 5 R0 [4]", -3, params.getColumnPos(3));
+        assertEquals("5 key auto 5 R0 [5]", -4, params.getColumnPos(4));
+        assertEquals("5 key auto 5 R0 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("5 key auto 5 R0 default", WIDTH * 4, params.getDefaultKeyCoordX());
+    }
+
+    // [5] [4] [3] [2] <1> ___|
+    public void testLayout5KeyAuto5R1() {
+        MoreKeysKeyboardParams params = createParams(5, 5, XPOS_R1);
+        assertEquals("5 key auto 5 R1 columns", 5, params.mNumColumns);
+        assertEquals("5 key auto 5 R1 rows", 1, params.mNumRows);
+        assertEquals("5 key auto 5 R1 left", 4, params.mLeftKeys);
+        assertEquals("5 key auto 5 R1 right", 1, params.mRightKeys);
+        assertEquals("5 key auto 5 R1 <1>", 0, params.getColumnPos(0));
+        assertEquals("5 key auto 5 R1 [2]", -1, params.getColumnPos(1));
+        assertEquals("5 key auto 5 R1 [3]", -2, params.getColumnPos(2));
+        assertEquals("5 key auto 5 R1 [4]", -3, params.getColumnPos(3));
+        assertEquals("5 key auto 5 R1 [5]", -4, params.getColumnPos(4));
+        assertEquals("5 key auto 5 R1 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("5 key auto 5 R1 default", WIDTH * 4, params.getDefaultKeyCoordX());
+    }
+
+    // [5] [4] [3] <1> [2] ___|
+    public void testLayout5KeyAuto5R2() {
+        MoreKeysKeyboardParams params = createParams(5, 5, XPOS_R2);
+        assertEquals("5 key auto 5 R2 columns", 5, params.mNumColumns);
+        assertEquals("5 key auto 5 R2 rows", 1, params.mNumRows);
+        assertEquals("5 key auto 5 R2 left", 3, params.mLeftKeys);
+        assertEquals("5 key auto 5 R2 right", 2, params.mRightKeys);
+        assertEquals("5 key auto 5 R2 <1>", 0, params.getColumnPos(0));
+        assertEquals("5 key auto 5 R2 [2]", 1, params.getColumnPos(1));
+        assertEquals("5 key auto 5 R2 [3]", -1, params.getColumnPos(2));
+        assertEquals("5 key auto 5 R2 [4]", -2, params.getColumnPos(3));
+        assertEquals("5 key auto 5 R2 [5]", -3, params.getColumnPos(4));
+        assertEquals("5 key auto 5 R2 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("5 key auto 5 R2 default", WIDTH * 3, params.getDefaultKeyCoordX());
+    }
+
+    //     [5] [6]
+    // [3] <1> [2] [4]
+    public void testLayout6KeyAuto4M0() {
+        MoreKeysKeyboardParams params = createParams(6, 4, XPOS_M0);
+        assertEquals("6 key auto 4 M0 columns", 4, params.mNumColumns);
+        assertEquals("6 key auto 4 M0 rows", 2, params.mNumRows);
+        assertEquals("6 key auto 4 M0 left", 1, params.mLeftKeys);
+        assertEquals("6 key auto 4 M0 right", 3, params.mRightKeys);
+        assertEquals("6 key auto 4 M0 <1>", 0, params.getColumnPos(0));
+        assertEquals("6 key auto 4 M0 [2]", 1, params.getColumnPos(1));
+        assertEquals("6 key auto 4 M0 [3]", -1, params.getColumnPos(2));
+        assertEquals("6 key auto 4 M0 [4]", 2, params.getColumnPos(3));
+        assertEquals("6 key auto 4 M0 [5]", 0, params.getColumnPos(4));
+        assertEquals("6 key auto 4 M0 [6]", 1, params.getColumnPos(5));
+        assertEquals("6 key auto 4 M0 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("6 key auto 4 M0 default", WIDTH * 1, params.getDefaultKeyCoordX());
+    }
+
+    // |[5] [6]
+    // |<1> [2] [3] [4]
+    public void testLayout6KeyAuto4L0() {
+        MoreKeysKeyboardParams params = createParams(6, 4, XPOS_L0);
+        assertEquals("6 key auto 4 L0 columns", 4, params.mNumColumns);
+        assertEquals("6 key auto 4 L0 rows", 2, params.mNumRows);
+        assertEquals("6 key auto 4 L0 left", 0, params.mLeftKeys);
+        assertEquals("6 key auto 4 L0 right", 4, params.mRightKeys);
+        assertEquals("6 key auto 4 L0 <1>", 0, params.getColumnPos(0));
+        assertEquals("6 key auto 4 L0 [2]", 1, params.getColumnPos(1));
+        assertEquals("6 key auto 4 L0 [3]", 2, params.getColumnPos(2));
+        assertEquals("6 key auto 4 L0 [4]", 3, params.getColumnPos(3));
+        assertEquals("6 key auto 4 L0 [5]", 0, params.getColumnPos(4));
+        assertEquals("6 key auto 4 L0 [6]", 1, params.getColumnPos(5));
+        assertEquals("6 key auto 4 L0 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("6 key auto 4 L0 default", WIDTH * 0, params.getDefaultKeyCoordX());
+    }
+
+    // |___ [5] [6]
+    // |___ <1> [2] [3] [4]
+    public void testLayout6KeyAuto4L1() {
+        MoreKeysKeyboardParams params = createParams(6, 4, XPOS_L1);
+        assertEquals("6 key auto 4 L1 columns", 4, params.mNumColumns);
+        assertEquals("6 key auto 4 L1 rows", 2, params.mNumRows);
+        assertEquals("6 key auto 4 L1 left", 0, params.mLeftKeys);
+        assertEquals("6 key auto 4 L1 right", 4, params.mRightKeys);
+        assertEquals("6 key auto 4 L1 <1>", 0, params.getColumnPos(0));
+        assertEquals("6 key auto 4 L1 [2]", 1, params.getColumnPos(1));
+        assertEquals("6 key auto 4 L1 [3]", 2, params.getColumnPos(2));
+        assertEquals("6 key auto 4 L1 [4]", 3, params.getColumnPos(3));
+        assertEquals("6 key auto 4 L1 [5]", 0, params.getColumnPos(4));
+        assertEquals("6 key auto 4 L1 [6]", 1, params.getColumnPos(5));
+        assertEquals("6 key auto 4 L1 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("6 key auto 4 L1 default", WIDTH * 0, params.getDefaultKeyCoordX());
+    }
+
+    // |___     [5] [6]
+    // |___ [3] <1> [2] [4]
+    public void testLayout6KeyAuto4L2() {
+        MoreKeysKeyboardParams params = createParams(6, 4, XPOS_L2);
+        assertEquals("6 key auto 4 L2 columns", 4, params.mNumColumns);
+        assertEquals("6 key auto 4 L2 rows", 2, params.mNumRows);
+        assertEquals("6 key auto 4 L2 left", 1, params.mLeftKeys);
+        assertEquals("6 key auto 4 L2 right", 3, params.mRightKeys);
+        assertEquals("6 key auto 4 L2 <1>", 0, params.getColumnPos(0));
+        assertEquals("6 key auto 4 L2 [2]", 1, params.getColumnPos(1));
+        assertEquals("6 key auto 4 L2 [3]", -1, params.getColumnPos(2));
+        assertEquals("6 key auto 4 L2 [4]", 2, params.getColumnPos(3));
+        assertEquals("6 key auto 4 L2 [5]", 0, params.getColumnPos(4));
+        assertEquals("6 key auto 4 L2 [6]", 1, params.getColumnPos(5));
+        assertEquals("6 key auto 4 L2 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("6 key auto 4 L2 default", WIDTH * 1, params.getDefaultKeyCoordX());
+    }
+
+    //         [6] [5]|
+    // [4] [3] [2] <1>|
+    public void testLayout6KeyAuto4R0() {
+        MoreKeysKeyboardParams params = createParams(6, 4, XPOS_R0);
+        assertEquals("6 key auto 4 R0 columns", 4, params.mNumColumns);
+        assertEquals("6 key auto 4 R0 rows", 2, params.mNumRows);
+        assertEquals("6 key auto 4 R0 left", 3, params.mLeftKeys);
+        assertEquals("6 key auto 4 R0 right", 1, params.mRightKeys);
+        assertEquals("6 key auto 4 R0 <1>", 0, params.getColumnPos(0));
+        assertEquals("6 key auto 4 R0 [2]", -1, params.getColumnPos(1));
+        assertEquals("6 key auto 4 R0 [3]", -2, params.getColumnPos(2));
+        assertEquals("6 key auto 4 R0 [4]", -3, params.getColumnPos(3));
+        assertEquals("6 key auto 4 R0 [5]", 0, params.getColumnPos(4));
+        assertEquals("6 key auto 4 R0 [6]", -1, params.getColumnPos(5));
+        assertEquals("6 key auto 4 R0 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("6 key auto 4 R0 default", WIDTH * 3, params.getDefaultKeyCoordX());
+    }
+
+    //         [6] [5] ___|
+    // [4] [3] [2] <1> ___|
+    public void testLayout6KeyAuto4R1() {
+        MoreKeysKeyboardParams params = createParams(6, 4, XPOS_R1);
+        assertEquals("6 key auto 4 R1 columns", 4, params.mNumColumns);
+        assertEquals("6 key auto 4 R1 rows", 2, params.mNumRows);
+        assertEquals("6 key auto 4 R1 left", 3, params.mLeftKeys);
+        assertEquals("6 key auto 4 R1 right", 1, params.mRightKeys);
+        assertEquals("6 key auto 4 R1 <1>", 0, params.getColumnPos(0));
+        assertEquals("6 key auto 4 R1 [2]", -1, params.getColumnPos(1));
+        assertEquals("6 key auto 4 R1 [3]", -2, params.getColumnPos(2));
+        assertEquals("6 key auto 4 R1 [4]", -3, params.getColumnPos(3));
+        assertEquals("6 key auto 4 R1 [5]", 0, params.getColumnPos(4));
+        assertEquals("6 key auto 4 R1 [6]", -1, params.getColumnPos(5));
+        assertEquals("6 key auto 4 R1 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("6 key auto 4 R1 default", WIDTH * 3, params.getDefaultKeyCoordX());
+    }
+
+    //         [5] [6] ___|
+    // [4] [3] <1> [2] ___|
+    public void testLayout6KeyAuto4R2() {
+        MoreKeysKeyboardParams params = createParams(6, 4, XPOS_R2);
+        assertEquals("6 key auto 4 R2 columns", 4, params.mNumColumns);
+        assertEquals("6 key auto 4 R2 rows", 2, params.mNumRows);
+        assertEquals("6 key auto 4 R2 left", 2, params.mLeftKeys);
+        assertEquals("6 key auto 4 R2 right", 2, params.mRightKeys);
+        assertEquals("6 key auto 4 R2 <1>", 0, params.getColumnPos(0));
+        assertEquals("6 key auto 4 R2 [2]", 1, params.getColumnPos(1));
+        assertEquals("6 key auto 4 R2 [3]", -1, params.getColumnPos(2));
+        assertEquals("6 key auto 4 R2 [4]", -2, params.getColumnPos(3));
+        assertEquals("6 key auto 4 R2 [5]", 0, params.getColumnPos(4));
+        assertEquals("6 key auto 4 R2 [6]", 1, params.getColumnPos(5));
+        assertEquals("6 key auto 4 R2 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("6 key auto 4 R2 default", WIDTH * 2, params.getDefaultKeyCoordX());
+    }
+
+    //         [6]
+    // [5] [3] <1> [2] [4]
+    public void testLayout6KeyAuto5M0() {
+        MoreKeysKeyboardParams params = createParams(6, 5, XPOS_M0);
+        assertEquals("6 key auto 5 M0 columns", 5, params.mNumColumns);
+        assertEquals("6 key auto 5 M0 rows", 2, params.mNumRows);
+        assertEquals("6 key auto 5 M0 left", 2, params.mLeftKeys);
+        assertEquals("6 key auto 5 M0 right", 3, params.mRightKeys);
+        assertEquals("6 key auto 5 M0 <1>", 0, params.getColumnPos(0));
+        assertEquals("6 key auto 5 M0 [2]", 1, params.getColumnPos(1));
+        assertEquals("6 key auto 5 M0 [3]", -1, params.getColumnPos(2));
+        assertEquals("6 key auto 5 M0 [4]", 2, params.getColumnPos(3));
+        assertEquals("6 key auto 5 M0 [5]", -2, params.getColumnPos(4));
+        assertEquals("6 key auto 5 M0 [6]", 0, params.getColumnPos(5));
+        assertEquals("6 key auto 5 M0 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("6 key auto 5 M0 default", WIDTH * 2, params.getDefaultKeyCoordX());
+    }
+
+    // |[6]
+    // |<1> [2] [3] [4] [5]
+    public void testLayout6KeyAuto5L0() {
+        MoreKeysKeyboardParams params = createParams(6, 5, XPOS_L0);
+        assertEquals("6 key auto 5 L0 columns", 5, params.mNumColumns);
+        assertEquals("6 key auto 5 L0 rows", 2, params.mNumRows);
+        assertEquals("6 key auto 5 L0 left", 0, params.mLeftKeys);
+        assertEquals("6 key auto 5 L0 right", 5, params.mRightKeys);
+        assertEquals("6 key auto 5 L0 <1>", 0, params.getColumnPos(0));
+        assertEquals("6 key auto 5 L0 [2]", 1, params.getColumnPos(1));
+        assertEquals("6 key auto 5 L0 [3]", 2, params.getColumnPos(2));
+        assertEquals("6 key auto 5 L0 [4]", 3, params.getColumnPos(3));
+        assertEquals("6 key auto 5 L0 [5]", 4, params.getColumnPos(4));
+        assertEquals("6 key auto 5 L0 [6]", 0, params.getColumnPos(5));
+        assertEquals("6 key auto 5 L0 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("6 key auto 5 L0 default", WIDTH * 0, params.getDefaultKeyCoordX());
+    }
+
+    // |___ [6]
+    // |___ <1> [2] [3] [4] [5]
+    public void testLayout6KeyAuto5L1() {
+        MoreKeysKeyboardParams params = createParams(6, 5, XPOS_L1);
+        assertEquals("6 key auto 5 L1 columns", 5, params.mNumColumns);
+        assertEquals("6 key auto 5 L1 rows", 2, params.mNumRows);
+        assertEquals("6 key auto 5 L1 left", 0, params.mLeftKeys);
+        assertEquals("6 key auto 5 L1 right", 5, params.mRightKeys);
+        assertEquals("6 key auto 5 L1 <1>", 0, params.getColumnPos(0));
+        assertEquals("6 key auto 5 L1 [2]", 1, params.getColumnPos(1));
+        assertEquals("6 key auto 5 L1 [3]", 2, params.getColumnPos(2));
+        assertEquals("6 key auto 5 L1 [4]", 3, params.getColumnPos(3));
+        assertEquals("6 key auto 5 L1 [5]", 4, params.getColumnPos(4));
+        assertEquals("6 key auto 5 L1 [6]", 0, params.getColumnPos(5));
+        assertEquals("6 key auto 5 L1 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("6 key auto 5 L1 default", WIDTH * 0, params.getDefaultKeyCoordX());
+    }
+
+    // |___     [6]
+    // |___ [3] <1> [2] [4] [5]
+    public void testLayout6KeyAuto5L2() {
+        MoreKeysKeyboardParams params = createParams(6, 5, XPOS_L2);
+        assertEquals("6 key auto 5 L2 columns", 5, params.mNumColumns);
+        assertEquals("6 key auto 5 L2 rows", 2, params.mNumRows);
+        assertEquals("6 key auto 5 L2 left", 1, params.mLeftKeys);
+        assertEquals("6 key auto 5 L2 right", 4, params.mRightKeys);
+        assertEquals("6 key auto 5 L2 <1>", 0, params.getColumnPos(0));
+        assertEquals("6 key auto 5 L2 [2]", 1, params.getColumnPos(1));
+        assertEquals("6 key auto 5 L2 [3]", -1, params.getColumnPos(2));
+        assertEquals("6 key auto 5 L2 [4]", 2, params.getColumnPos(3));
+        assertEquals("6 key auto 5 L2 [5]", 3, params.getColumnPos(4));
+        assertEquals("6 key auto 5 L2 [6]", 0, params.getColumnPos(5));
+        assertEquals("6 key auto 5 L2 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("6 key auto 5 L2 default", WIDTH * 1, params.getDefaultKeyCoordX());
+    }
+
+    //                 [6]|
+    // [5] [4] [3] [2] <1>|
+    public void testLayout6KeyAuto5R0() {
+        MoreKeysKeyboardParams params = createParams(6, 5, XPOS_R0);
+        assertEquals("6 key auto 5 R0 columns", 5, params.mNumColumns);
+        assertEquals("6 key auto 5 R0 rows", 2, params.mNumRows);
+        assertEquals("6 key auto 5 R0 left", 4, params.mLeftKeys);
+        assertEquals("6 key auto 5 R0 right", 1, params.mRightKeys);
+        assertEquals("6 key auto 5 R0 <1>", 0, params.getColumnPos(0));
+        assertEquals("6 key auto 5 R0 [2]", -1, params.getColumnPos(1));
+        assertEquals("6 key auto 5 R0 [3]", -2, params.getColumnPos(2));
+        assertEquals("6 key auto 5 R0 [4]", -3, params.getColumnPos(3));
+        assertEquals("6 key auto 5 R0 [5]", -4, params.getColumnPos(4));
+        assertEquals("6 key auto 5 R0 [6]", 0, params.getColumnPos(5));
+        assertEquals("6 key auto 5 R0 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("6 key auto 5 R0 default", WIDTH * 4, params.getDefaultKeyCoordX());
+    }
+
+    //                 [6] ___|
+    // [5] [4] [3] [2] <1> ___|
+    public void testLayout6KeyAuto5R1() {
+        MoreKeysKeyboardParams params = createParams(6, 5, XPOS_R1);
+        assertEquals("6 key auto 5 R1 columns", 5, params.mNumColumns);
+        assertEquals("6 key auto 5 R1 rows", 2, params.mNumRows);
+        assertEquals("6 key auto 5 R1 left", 4, params.mLeftKeys);
+        assertEquals("6 key auto 5 R1 right", 1, params.mRightKeys);
+        assertEquals("6 key auto 5 R1 <1>", 0, params.getColumnPos(0));
+        assertEquals("6 key auto 5 R1 [2]", -1, params.getColumnPos(1));
+        assertEquals("6 key auto 5 R1 [3]", -2, params.getColumnPos(2));
+        assertEquals("6 key auto 5 R1 [4]", -3, params.getColumnPos(3));
+        assertEquals("6 key auto 5 R1 [5]", -4, params.getColumnPos(4));
+        assertEquals("6 key auto 5 R1 [6]", 0, params.getColumnPos(5));
+        assertEquals("6 key auto 5 R1 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("6 key auto 5 R1 default", WIDTH * 4, params.getDefaultKeyCoordX());
+    }
+
+    //             [6]     ___|
+    // [5] [4] [3] <1> [2] ___|
+    public void testLayout6KeyAuto5R2() {
+        MoreKeysKeyboardParams params = createParams(6, 5, XPOS_R2);
+        assertEquals("6 key auto 5 R2 columns", 5, params.mNumColumns);
+        assertEquals("6 key auto 5 R2 rows", 2, params.mNumRows);
+        assertEquals("6 key auto 5 R2 left", 3, params.mLeftKeys);
+        assertEquals("6 key auto 5 R2 right", 2, params.mRightKeys);
+        assertEquals("6 key auto 5 R2 <1>", 0, params.getColumnPos(0));
+        assertEquals("6 key auto 5 R2 [2]", 1, params.getColumnPos(1));
+        assertEquals("6 key auto 5 R2 [3]", -1, params.getColumnPos(2));
+        assertEquals("6 key auto 5 R2 [4]", -2, params.getColumnPos(3));
+        assertEquals("6 key auto 5 R2 [5]", -3, params.getColumnPos(4));
+        assertEquals("6 key auto 5 R2 [6]", 0, params.getColumnPos(5));
+        assertEquals("6 key auto 5 R2 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("6 key auto 5 R2 default", WIDTH * 3, params.getDefaultKeyCoordX());
+    }
+
+    // |<1> [2] [3] [4] [5] [6] [7] ___ ___ ___|
+    public void testLayout7KeyAuto7L0() {
+        MoreKeysKeyboardParams params = createParams(7, 7, XPOS_L0);
+        assertEquals("7 key auto 7 L0 columns", 7, params.mNumColumns);
+        assertEquals("7 key auto 7 L0 rows", 1, params.mNumRows);
+        assertEquals("7 key auto 7 L0 left", 0, params.mLeftKeys);
+        assertEquals("7 key auto 7 L0 right", 7, params.mRightKeys);
+        assertEquals("7 key auto 7 L0 <1>", 0, params.getColumnPos(0));
+        assertEquals("7 key auto 7 L0 [2]", 1, params.getColumnPos(1));
+        assertEquals("7 key auto 7 L0 [3]", 2, params.getColumnPos(2));
+        assertEquals("7 key auto 7 L0 [4]", 3, params.getColumnPos(3));
+        assertEquals("7 key auto 7 L0 [5]", 4, params.getColumnPos(4));
+        assertEquals("7 key auto 7 L0 [6]", 5, params.getColumnPos(5));
+        assertEquals("7 key auto 7 L0 [7]", 6, params.getColumnPos(6));
+        assertEquals("7 key auto 7 L0 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("7 key auto 7 L0 default", WIDTH * 0, params.getDefaultKeyCoordX());
+    }
+
+    // |___ <1> [2] [3] [4] [5] [6] [7] ___ ___|
+    public void testLayout7KeyAuto7L1() {
+        MoreKeysKeyboardParams params = createParams(7, 7, XPOS_L1);
+        assertEquals("7 key auto 7 L1 columns", 7, params.mNumColumns);
+        assertEquals("7 key auto 7 L1 rows", 1, params.mNumRows);
+        assertEquals("7 key auto 7 L1 left", 0, params.mLeftKeys);
+        assertEquals("7 key auto 7 L1 right", 7, params.mRightKeys);
+        assertEquals("7 key auto 7 L1 <1>", 0, params.getColumnPos(0));
+        assertEquals("7 key auto 7 L1 [2]", 1, params.getColumnPos(1));
+        assertEquals("7 key auto 7 L1 [3]", 2, params.getColumnPos(2));
+        assertEquals("7 key auto 7 L1 [4]", 3, params.getColumnPos(3));
+        assertEquals("7 key auto 7 L1 [5]", 4, params.getColumnPos(4));
+        assertEquals("7 key auto 7 L1 [6]", 5, params.getColumnPos(5));
+        assertEquals("7 key auto 7 L1 [7]", 6, params.getColumnPos(6));
+        assertEquals("7 key auto 7 L1 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("7 key auto 7 L1 default", WIDTH * 0, params.getDefaultKeyCoordX());
+    }
+
+    // |___ [3] <1> [2] [4] [5] [6] [7] ___ ___|
+    public void testLayout7KeyAuto7L2() {
+        MoreKeysKeyboardParams params = createParams(7, 7, XPOS_L2);
+        assertEquals("7 key auto 7 L2 columns", 7, params.mNumColumns);
+        assertEquals("7 key auto 7 L2 rows", 1, params.mNumRows);
+        assertEquals("7 key auto 7 L2 left", 1, params.mLeftKeys);
+        assertEquals("7 key auto 7 L2 right", 6, params.mRightKeys);
+        assertEquals("7 key auto 7 L2 <1>", 0, params.getColumnPos(0));
+        assertEquals("7 key auto 7 L2 [2]", 1, params.getColumnPos(1));
+        assertEquals("7 key auto 7 L2 [3]", -1, params.getColumnPos(2));
+        assertEquals("7 key auto 7 L2 [4]", 2, params.getColumnPos(3));
+        assertEquals("7 key auto 7 L2 [5]", 3, params.getColumnPos(4));
+        assertEquals("7 key auto 7 L2 [6]", 4, params.getColumnPos(5));
+        assertEquals("7 key auto 7 L2 [7]", 5, params.getColumnPos(6));
+        assertEquals("7 key auto 7 L2 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("7 key auto 7 L2 default", WIDTH * 1, params.getDefaultKeyCoordX());
+    }
+
+    // |___ [5] [3] <1> [2] [4] [6] [7] ___ ___|
+    public void testLayout7KeyAuto7L3() {
+        MoreKeysKeyboardParams params = createParams(7, 7, XPOS_L3);
+        assertEquals("7 key auto 7 L3 columns", 7, params.mNumColumns);
+        assertEquals("7 key auto 7 L3 rows", 1, params.mNumRows);
+        assertEquals("7 key auto 7 L3 left", 2, params.mLeftKeys);
+        assertEquals("7 key auto 7 L3 right", 5, params.mRightKeys);
+        assertEquals("7 key auto 7 L3 <1>", 0, params.getColumnPos(0));
+        assertEquals("7 key auto 7 L3 [2]", 1, params.getColumnPos(1));
+        assertEquals("7 key auto 7 L3 [3]", -1, params.getColumnPos(2));
+        assertEquals("7 key auto 7 L3 [4]", 2, params.getColumnPos(3));
+        assertEquals("7 key auto 7 L3 [5]", -2, params.getColumnPos(4));
+        assertEquals("7 key auto 7 L3 [6]", 3, params.getColumnPos(5));
+        assertEquals("7 key auto 7 L3 [7]", 4, params.getColumnPos(6));
+        assertEquals("7 key auto 7 L3 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("7 key auto 7 L3 default", WIDTH * 2, params.getDefaultKeyCoordX());
+    }
+
+    // |___ [7] [5] [3] <1> [2] [4] [6] ___ ___|
+    public void testLayout7KeyAuto7M0() {
+        MoreKeysKeyboardParams params = createParams(7, 7, XPOS_M0);
+        assertEquals("7 key auto 7 M0 columns", 7, params.mNumColumns);
+        assertEquals("7 key auto 7 M0 rows", 1, params.mNumRows);
+        assertEquals("7 key auto 7 M0 left", 3, params.mLeftKeys);
+        assertEquals("7 key auto 7 M0 right", 4, params.mRightKeys);
+        assertEquals("7 key auto 7 M0 <1>", 0, params.getColumnPos(0));
+        assertEquals("7 key auto 7 M0 [2]", 1, params.getColumnPos(1));
+        assertEquals("7 key auto 7 M0 [3]", -1, params.getColumnPos(2));
+        assertEquals("7 key auto 7 M0 [4]", 2, params.getColumnPos(3));
+        assertEquals("7 key auto 7 M0 [5]", -2, params.getColumnPos(4));
+        assertEquals("7 key auto 7 M0 [6]", 3, params.getColumnPos(5));
+        assertEquals("7 key auto 7 M0 [7]", -3, params.getColumnPos(6));
+        assertEquals("7 key auto 7 M0 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("7 key auto 7 M0 default", WIDTH * 3, params.getDefaultKeyCoordX());
+    }
+
+    // |___ ___ [7] [5] [3] <1> [2] [4] [6] ___|
+    public void testLayout7KeyAuto7M1() {
+        MoreKeysKeyboardParams params = createParams(7, 7, XPOS_M1);
+        assertEquals("7 key auto 7 M1 columns", 7, params.mNumColumns);
+        assertEquals("7 key auto 7 M1 rows", 1, params.mNumRows);
+        assertEquals("7 key auto 7 M1 left", 3, params.mLeftKeys);
+        assertEquals("7 key auto 7 M1 right", 4, params.mRightKeys);
+        assertEquals("7 key auto 7 M1 <1>", 0, params.getColumnPos(0));
+        assertEquals("7 key auto 7 M1 [2]", 1, params.getColumnPos(1));
+        assertEquals("7 key auto 7 M1 [3]", -1, params.getColumnPos(2));
+        assertEquals("7 key auto 7 M1 [4]", 2, params.getColumnPos(3));
+        assertEquals("7 key auto 7 M1 [5]", -2, params.getColumnPos(4));
+        assertEquals("7 key auto 7 M1 [6]", 3, params.getColumnPos(5));
+        assertEquals("7 key auto 7 M1 [7]", -3, params.getColumnPos(6));
+        assertEquals("7 key auto 7 M1 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("7 key auto 7 M1 default", WIDTH * 3, params.getDefaultKeyCoordX());
+    }
+
+    // |___ ___ [7] [6] [5] [3] <1> [2] [4] ___|
+    public void testLayout7KeyAuto7R3() {
+        MoreKeysKeyboardParams params = createParams(7, 7, XPOS_R3);
+        assertEquals("7 key auto 7 R3 columns", 7, params.mNumColumns);
+        assertEquals("7 key auto 7 R3 rows", 1, params.mNumRows);
+        assertEquals("7 key auto 7 R3 left", 4, params.mLeftKeys);
+        assertEquals("7 key auto 7 R3 right", 3, params.mRightKeys);
+        assertEquals("7 key auto 7 R3 <1>", 0, params.getColumnPos(0));
+        assertEquals("7 key auto 7 R3 [2]", 1, params.getColumnPos(1));
+        assertEquals("7 key auto 7 R3 [3]", -1, params.getColumnPos(2));
+        assertEquals("7 key auto 7 R3 [4]", 2, params.getColumnPos(3));
+        assertEquals("7 key auto 7 R3 [5]", -2, params.getColumnPos(4));
+        assertEquals("7 key auto 7 R3 [6]", -3, params.getColumnPos(5));
+        assertEquals("7 key auto 7 R3 [7]", -4, params.getColumnPos(6));
+        assertEquals("7 key auto 7 R3 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("7 key auto 7 R3 default", WIDTH * 4, params.getDefaultKeyCoordX());
+    }
+
+    // |___ ___ [7] [6] [5] [4] [3] <1> [2] ___|
+    public void testLayout7KeyAuto7R2() {
+        MoreKeysKeyboardParams params = createParams(7, 7, XPOS_R2);
+        assertEquals("7 key auto 7 R2 columns", 7, params.mNumColumns);
+        assertEquals("7 key auto 7 R2 rows", 1, params.mNumRows);
+        assertEquals("7 key auto 7 R2 left", 5, params.mLeftKeys);
+        assertEquals("7 key auto 7 R2 right", 2, params.mRightKeys);
+        assertEquals("7 key auto 7 R2 <1>", 0, params.getColumnPos(0));
+        assertEquals("7 key auto 7 R2 [2]", 1, params.getColumnPos(1));
+        assertEquals("7 key auto 7 R2 [3]", -1, params.getColumnPos(2));
+        assertEquals("7 key auto 7 R2 [4]", -2, params.getColumnPos(3));
+        assertEquals("7 key auto 7 R2 [5]", -3, params.getColumnPos(4));
+        assertEquals("7 key auto 7 R2 [6]", -4, params.getColumnPos(5));
+        assertEquals("7 key auto 7 R2 [7]", -5, params.getColumnPos(6));
+        assertEquals("7 key auto 7 R2 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("7 key auto 7 R2 default", WIDTH * 5, params.getDefaultKeyCoordX());
+    }
+
+    // |___ ___ [7] [6] [5] [4] [3] [2] <1> ___|
+    public void testLayout7KeyAuto7R1() {
+        MoreKeysKeyboardParams params = createParams(7, 7, XPOS_R1);
+        assertEquals("7 key auto 7 R1 columns", 7, params.mNumColumns);
+        assertEquals("7 key auto 7 R1 rows", 1, params.mNumRows);
+        assertEquals("7 key auto 7 R1 left", 6, params.mLeftKeys);
+        assertEquals("7 key auto 7 R1 right", 1, params.mRightKeys);
+        assertEquals("7 key auto 7 R1 <1>", 0, params.getColumnPos(0));
+        assertEquals("7 key auto 7 R1 [2]", -1, params.getColumnPos(1));
+        assertEquals("7 key auto 7 R1 [3]", -2, params.getColumnPos(2));
+        assertEquals("7 key auto 7 R1 [4]", -3, params.getColumnPos(3));
+        assertEquals("7 key auto 7 R1 [5]", -4, params.getColumnPos(4));
+        assertEquals("7 key auto 7 R1 [6]", -5, params.getColumnPos(5));
+        assertEquals("7 key auto 7 R1 [7]", -6, params.getColumnPos(6));
+        assertEquals("7 key auto 7 R1 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("7 key auto 7 R1 default", WIDTH * 6, params.getDefaultKeyCoordX());
+    }
+
+    // |___ ___ [7] [6] [5] [4] [3] [2] <1>|
+    public void testLayout7KeyAuto7R0() {
+        MoreKeysKeyboardParams params = createParams(7, 7, XPOS_R0);
+        assertEquals("7 key auto 7 R0 columns", 7, params.mNumColumns);
+        assertEquals("7 key auto 7 R0 rows", 1, params.mNumRows);
+        assertEquals("7 key auto 7 R0 left", 6, params.mLeftKeys);
+        assertEquals("7 key auto 7 R0 right", 1, params.mRightKeys);
+        assertEquals("7 key auto 7 R0 <1>", 0, params.getColumnPos(0));
+        assertEquals("7 key auto 7 R0 [2]", -1, params.getColumnPos(1));
+        assertEquals("7 key auto 7 R0 [3]", -2, params.getColumnPos(2));
+        assertEquals("7 key auto 7 R0 [4]", -3, params.getColumnPos(3));
+        assertEquals("7 key auto 7 R0 [5]", -4, params.getColumnPos(4));
+        assertEquals("7 key auto 7 R0 [6]", -5, params.getColumnPos(5));
+        assertEquals("7 key auto 7 R0 [7]", -6, params.getColumnPos(6));
+        assertEquals("7 key auto 7 R0 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("7 key auto 7 R0 default", WIDTH * 6, params.getDefaultKeyCoordX());
+    }
+
+    //       [6] [7]
+    // [5] [3] <1> [2] [4]
+    public void testLayout7KeyAuto5M0() {
+        MoreKeysKeyboardParams params = createParams(7, 5, XPOS_M0);
+        assertEquals("7 key auto 5 M0 columns", 5, params.mNumColumns);
+        assertEquals("7 key auto 5 M0 rows", 2, params.mNumRows);
+        assertEquals("7 key auto 5 M0 left", 2, params.mLeftKeys);
+        assertEquals("7 key auto 5 M0 right", 3, params.mRightKeys);
+        assertEquals("7 key auto 5 M0 <1>", 0, params.getColumnPos(0));
+        assertEquals("7 key auto 5 M0 [2]", 1, params.getColumnPos(1));
+        assertEquals("7 key auto 5 M0 [3]", -1, params.getColumnPos(2));
+        assertEquals("7 key auto 5 M0 [4]", 2, params.getColumnPos(3));
+        assertEquals("7 key auto 5 M0 [5]", -2, params.getColumnPos(4));
+        assertEquals("7 key auto 5 M0 [6]", 0, params.getColumnPos(5));
+        assertEquals("7 key auto 5 M0 [7]", 1, params.getColumnPos(6));
+        assertEquals("7 key auto 5 M0 adjust", -1, params.mTopRowAdjustment);
+        assertEquals("7 key auto 5 M0 default", WIDTH * 2, params.getDefaultKeyCoordX());
+    }
+
+    // |[6] [7]
+    // |<1> [2] [3] [4] [5]
+    public void testLayout7KeyAuto5L0() {
+        MoreKeysKeyboardParams params = createParams(7, 5, XPOS_L0);
+        assertEquals("7 key auto 5 L0 columns", 5, params.mNumColumns);
+        assertEquals("7 key auto 5 L0 rows", 2, params.mNumRows);
+        assertEquals("7 key auto 5 L0 left", 0, params.mLeftKeys);
+        assertEquals("7 key auto 5 L0 right", 5, params.mRightKeys);
+        assertEquals("7 key auto 5 L0 <1>", 0, params.getColumnPos(0));
+        assertEquals("7 key auto 5 L0 [2]", 1, params.getColumnPos(1));
+        assertEquals("7 key auto 5 L0 [3]", 2, params.getColumnPos(2));
+        assertEquals("7 key auto 5 L0 [4]", 3, params.getColumnPos(3));
+        assertEquals("7 key auto 5 L0 [5]", 4, params.getColumnPos(4));
+        assertEquals("7 key auto 5 L0 [6]", 0, params.getColumnPos(5));
+        assertEquals("7 key auto 5 L0 [7]", 1, params.getColumnPos(6));
+        assertEquals("7 key auto 5 L0 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("7 key auto 5 L0 default", WIDTH * 0, params.getDefaultKeyCoordX());
+    }
+
+    // |___ [6] [7]
+    // |___ <1> [2] [3] [4] [5]
+    public void testLayout7KeyAuto5L1() {
+        MoreKeysKeyboardParams params = createParams(7, 5, XPOS_L1);
+        assertEquals("7 key auto 5 L1 columns", 5, params.mNumColumns);
+        assertEquals("7 key auto 5 L1 rows", 2, params.mNumRows);
+        assertEquals("7 key auto 5 L1 left", 0, params.mLeftKeys);
+        assertEquals("7 key auto 5 L1 right", 5, params.mRightKeys);
+        assertEquals("7 key auto 5 L1 <1>", 0, params.getColumnPos(0));
+        assertEquals("7 key auto 5 L1 [2]", 1, params.getColumnPos(1));
+        assertEquals("7 key auto 5 L1 [3]", 2, params.getColumnPos(2));
+        assertEquals("7 key auto 5 L1 [4]", 3, params.getColumnPos(3));
+        assertEquals("7 key auto 5 L1 [5]", 4, params.getColumnPos(4));
+        assertEquals("7 key auto 5 L1 [6]", 0, params.getColumnPos(5));
+        assertEquals("7 key auto 5 L1 [7]", 1, params.getColumnPos(6));
+        assertEquals("7 key auto 5 L1 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("7 key auto 5 L1 default", WIDTH * 0, params.getDefaultKeyCoordX());
+    }
+
+    // |___   [6] [7]
+    // |___ [3] <1> [2] [4] [5]
+    public void testLayout7KeyAuto5L2() {
+        MoreKeysKeyboardParams params = createParams(7, 5, XPOS_L2);
+        assertEquals("7 key auto 5 L2 columns", 5, params.mNumColumns);
+        assertEquals("7 key auto 5 L2 rows", 2, params.mNumRows);
+        assertEquals("7 key auto 5 L2 left", 1, params.mLeftKeys);
+        assertEquals("7 key auto 5 L2 right", 4, params.mRightKeys);
+        assertEquals("7 key auto 5 L2 <1>", 0, params.getColumnPos(0));
+        assertEquals("7 key auto 5 L2 [2]", 1, params.getColumnPos(1));
+        assertEquals("7 key auto 5 L2 [3]", -1, params.getColumnPos(2));
+        assertEquals("7 key auto 5 L2 [4]", 2, params.getColumnPos(3));
+        assertEquals("7 key auto 5 L2 [5]", 3, params.getColumnPos(4));
+        assertEquals("7 key auto 5 L2 [6]", 0, params.getColumnPos(5));
+        assertEquals("7 key auto 5 L2 [7]", 1, params.getColumnPos(6));
+        assertEquals("7 key auto 5 L2 adjust", -1, params.mTopRowAdjustment);
+        assertEquals("7 key auto 5 L2 default", WIDTH * 1, params.getDefaultKeyCoordX());
+    }
+
+    //             [7] [6]|
+    // [5] [4] [3] [2] <1>|
+    public void testLayout7KeyAuto5R0() {
+        MoreKeysKeyboardParams params = createParams(7, 5, XPOS_R0);
+        assertEquals("7 key auto 5 R0 columns", 5, params.mNumColumns);
+        assertEquals("7 key auto 5 R0 rows", 2, params.mNumRows);
+        assertEquals("7 key auto 5 R0 left", 4, params.mLeftKeys);
+        assertEquals("7 key auto 5 R0 right", 1, params.mRightKeys);
+        assertEquals("7 key auto 5 R0 <1>", 0, params.getColumnPos(0));
+        assertEquals("7 key auto 5 R0 [2]", -1, params.getColumnPos(1));
+        assertEquals("7 key auto 5 R0 [3]", -2, params.getColumnPos(2));
+        assertEquals("7 key auto 5 R0 [4]", -3, params.getColumnPos(3));
+        assertEquals("7 key auto 5 R0 [5]", -4, params.getColumnPos(4));
+        assertEquals("7 key auto 5 R0 [6]", 0, params.getColumnPos(5));
+        assertEquals("7 key auto 5 R0 [7]", -1, params.getColumnPos(6));
+        assertEquals("7 key auto 5 R0 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("7 key auto 5 R0 default", WIDTH * 4, params.getDefaultKeyCoordX());
+    }
+
+    //             [7] [6] ___|
+    // [5] [4] [3] [2] <1> ___|
+    public void testLayout7KeyAuto5R1() {
+        MoreKeysKeyboardParams params = createParams(7, 5, XPOS_R1);
+        assertEquals("7 key auto 5 R1 columns", 5, params.mNumColumns);
+        assertEquals("7 key auto 5 R1 rows", 2, params.mNumRows);
+        assertEquals("7 key auto 5 R1 left", 4, params.mLeftKeys);
+        assertEquals("7 key auto 5 R1 right", 1, params.mRightKeys);
+        assertEquals("7 key auto 5 R1 <1>", 0, params.getColumnPos(0));
+        assertEquals("7 key auto 5 R1 [2]", -1, params.getColumnPos(1));
+        assertEquals("7 key auto 5 R1 [3]", -2, params.getColumnPos(2));
+        assertEquals("7 key auto 5 R1 [4]", -3, params.getColumnPos(3));
+        assertEquals("7 key auto 5 R1 [5]", -4, params.getColumnPos(4));
+        assertEquals("7 key auto 5 R1 [6]", 0, params.getColumnPos(5));
+        assertEquals("7 key auto 5 R1 [7]", -1, params.getColumnPos(6));
+        assertEquals("7 key auto 5 R1 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("7 key auto 5 R1 default", WIDTH * 4, params.getDefaultKeyCoordX());
+    }
+
+    //           [6] [7]   ___|
+    // [5] [4] [3] <1> [2] ___|
+    public void testLayout7KeyAuto5R2() {
+        MoreKeysKeyboardParams params = createParams(7, 5, XPOS_R2);
+        assertEquals("7 key auto 5 R2 columns", 5, params.mNumColumns);
+        assertEquals("7 key auto 5 R2 rows", 2, params.mNumRows);
+        assertEquals("7 key auto 5 R2 left", 3, params.mLeftKeys);
+        assertEquals("7 key auto 5 R2 right", 2, params.mRightKeys);
+        assertEquals("7 key auto 5 R2 <1>", 0, params.getColumnPos(0));
+        assertEquals("7 key auto 5 R2 [2]", 1, params.getColumnPos(1));
+        assertEquals("7 key auto 5 R2 [3]", -1, params.getColumnPos(2));
+        assertEquals("7 key auto 5 R2 [4]", -2, params.getColumnPos(3));
+        assertEquals("7 key auto 5 R2 [5]", -3, params.getColumnPos(4));
+        assertEquals("7 key auto 5 R2 [6]", 0, params.getColumnPos(5));
+        assertEquals("7 key auto 5 R2 [7]", 1, params.getColumnPos(6));
+        assertEquals("7 key auto 5 R2 adjust", -1, params.mTopRowAdjustment);
+        assertEquals("7 key auto 5 R2 default", WIDTH * 3, params.getDefaultKeyCoordX());
+    }
+
+    //     [7]
+    // [6] [4] [5]
+    // [3] <1> [2]
+    public void testLayout7KeyAuto3M0() {
+        MoreKeysKeyboardParams params = createParams(7, 3, XPOS_M0);
+        assertEquals("7 key auto 3 M0 columns", 3, params.mNumColumns);
+        assertEquals("7 key auto 3 M0 rows", 3, params.mNumRows);
+        assertEquals("7 key auto 3 M0 left", 1, params.mLeftKeys);
+        assertEquals("7 key auto 3 M0 right", 2, params.mRightKeys);
+        assertEquals("7 key auto 3 M0 <1>", 0, params.getColumnPos(0));
+        assertEquals("7 key auto 3 M0 [2]", 1, params.getColumnPos(1));
+        assertEquals("7 key auto 3 M0 [3]", -1, params.getColumnPos(2));
+        assertEquals("7 key auto 3 M0 [4]", 0, params.getColumnPos(3));
+        assertEquals("7 key auto 3 M0 [5]", 1, params.getColumnPos(4));
+        assertEquals("7 key auto 3 M0 [6]", -1, params.getColumnPos(5));
+        assertEquals("7 key auto 3 M0 [7]", 0, params.getColumnPos(6));
+        assertEquals("7 key auto 3 M0 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("7 key auto 3 M0 default", WIDTH * 1, params.getDefaultKeyCoordX());
+    }
+
+    // |[7]
+    // |[4] [5] [6]
+    // |<1> [2] [3]
+    public void testLayout7KeyAuto3L0() {
+        MoreKeysKeyboardParams params = createParams(7, 3, XPOS_L0);
+        assertEquals("7 key auto 3 L0 columns", 3, params.mNumColumns);
+        assertEquals("7 key auto 3 L0 rows", 3, params.mNumRows);
+        assertEquals("7 key auto 3 L0 left", 0, params.mLeftKeys);
+        assertEquals("7 key auto 3 L0 right", 3, params.mRightKeys);
+        assertEquals("7 key auto 3 L0 <1>", 0, params.getColumnPos(0));
+        assertEquals("7 key auto 3 L0 [2]", 1, params.getColumnPos(1));
+        assertEquals("7 key auto 3 L0 [3]", 2, params.getColumnPos(2));
+        assertEquals("7 key auto 3 L0 [4]", 0, params.getColumnPos(3));
+        assertEquals("7 key auto 3 L0 [5]", 1, params.getColumnPos(4));
+        assertEquals("7 key auto 3 L0 [6]", 2, params.getColumnPos(5));
+        assertEquals("7 key auto 3 L0 [7]", 0, params.getColumnPos(6));
+        assertEquals("7 key auto 3 L0 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("7 key auto 3 L0 default", WIDTH * 0, params.getDefaultKeyCoordX());
+    }
+
+    // |___ [7]
+    // |___ [4] [5] [6]
+    // |___ <1> [2] [3]
+    public void testLayout7KeyAuto3L1() {
+        MoreKeysKeyboardParams params = createParams(7, 3, XPOS_L1);
+        assertEquals("7 key auto 3 L1 columns", 3, params.mNumColumns);
+        assertEquals("7 key auto 3 L1 rows", 3, params.mNumRows);
+        assertEquals("7 key auto 3 L1 left", 0, params.mLeftKeys);
+        assertEquals("7 key auto 3 L1 right", 3, params.mRightKeys);
+        assertEquals("7 key auto 3 L1 <1>", 0, params.getColumnPos(0));
+        assertEquals("7 key auto 3 L1 [2]", 1, params.getColumnPos(1));
+        assertEquals("7 key auto 3 L1 [3]", 2, params.getColumnPos(2));
+        assertEquals("7 key auto 3 L1 [4]", 0, params.getColumnPos(3));
+        assertEquals("7 key auto 3 L1 [5]", 1, params.getColumnPos(4));
+        assertEquals("7 key auto 3 L1 [6]", 2, params.getColumnPos(5));
+        assertEquals("7 key auto 3 L1 [7]", 0, params.getColumnPos(6));
+        assertEquals("7 key auto 3 L1 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("7 key auto 3 L1 default", WIDTH * 0, params.getDefaultKeyCoordX());
+    }
+
+    // |___     [7]
+    // |___ [6] [4] [5]
+    // |___ [3] <1> [2]
+    public void testLayout7KeyAuto3L2() {
+        MoreKeysKeyboardParams params = createParams(7, 3, XPOS_L2);
+        assertEquals("7 key auto 3 L2 columns", 3, params.mNumColumns);
+        assertEquals("7 key auto 3 L2 rows", 3, params.mNumRows);
+        assertEquals("7 key auto 3 L2 left", 1, params.mLeftKeys);
+        assertEquals("7 key auto 3 L2 right", 2, params.mRightKeys);
+        assertEquals("7 key auto 3 L2 <1>", 0, params.getColumnPos(0));
+        assertEquals("7 key auto 3 L2 [2]", 1, params.getColumnPos(1));
+        assertEquals("7 key auto 3 L2 [3]", -1, params.getColumnPos(2));
+        assertEquals("7 key auto 3 L2 [4]", 0, params.getColumnPos(3));
+        assertEquals("7 key auto 3 L2 [5]", 1, params.getColumnPos(4));
+        assertEquals("7 key auto 3 L2 [6]", -1, params.getColumnPos(5));
+        assertEquals("7 key auto 3 L2 [7]", 0, params.getColumnPos(6));
+        assertEquals("7 key auto 3 L2 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("7 key auto 3 L2 default", WIDTH * 1, params.getDefaultKeyCoordX());
+    }
+
+    //         [7]|
+    // [6] [5] [4]|
+    // [3] [2] <1>|
+    public void testLayout7KeyAuto3R0() {
+        MoreKeysKeyboardParams params = createParams(7, 3, XPOS_R0);
+        assertEquals("7 key auto 3 R0 columns", 3, params.mNumColumns);
+        assertEquals("7 key auto 3 R0 rows", 3, params.mNumRows);
+        assertEquals("7 key auto 3 R0 left", 2, params.mLeftKeys);
+        assertEquals("7 key auto 3 R0 right", 1, params.mRightKeys);
+        assertEquals("7 key auto 3 R0 <1>", 0, params.getColumnPos(0));
+        assertEquals("7 key auto 3 R0 [2]", -1, params.getColumnPos(1));
+        assertEquals("7 key auto 3 R0 [3]", -2, params.getColumnPos(2));
+        assertEquals("7 key auto 3 R0 [4]", 0, params.getColumnPos(3));
+        assertEquals("7 key auto 3 R0 [5]", -1, params.getColumnPos(4));
+        assertEquals("7 key auto 3 R0 [6]", -2, params.getColumnPos(5));
+        assertEquals("7 key auto 3 R0 [7]", 0, params.getColumnPos(6));
+        assertEquals("7 key auto 3 R0 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("7 key auto 3 R0 default", WIDTH * 2, params.getDefaultKeyCoordX());
+    }
+
+    //         [7] ___|
+    // [6] [5] [4] ___|
+    // [3] [2] <1> ___|
+    public void testLayout7KeyAuto3R1() {
+        MoreKeysKeyboardParams params = createParams(7, 3, XPOS_R1);
+        assertEquals("7 key auto 3 R1 columns", 3, params.mNumColumns);
+        assertEquals("7 key auto 3 R1 rows", 3, params.mNumRows);
+        assertEquals("7 key auto 3 R1 left", 2, params.mLeftKeys);
+        assertEquals("7 key auto 3 R1 right", 1, params.mRightKeys);
+        assertEquals("7 key auto 3 R1 <1>", 0, params.getColumnPos(0));
+        assertEquals("7 key auto 3 R1 [2]", -1, params.getColumnPos(1));
+        assertEquals("7 key auto 3 R1 [3]", -2, params.getColumnPos(2));
+        assertEquals("7 key auto 3 R1 [4]", 0, params.getColumnPos(3));
+        assertEquals("7 key auto 3 R1 [5]", -1, params.getColumnPos(4));
+        assertEquals("7 key auto 3 R1 [6]", -2, params.getColumnPos(5));
+        assertEquals("7 key auto 3 R1 [7]", 0, params.getColumnPos(6));
+        assertEquals("7 key auto 3 R1 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("7 key auto 3 R1 default", WIDTH * 2, params.getDefaultKeyCoordX());
+    }
+
+    //     [7]     ___|
+    // [6] [4] [5] ___|
+    // [3] <1> [2] ___|
+    public void testLayout7KeyAuto3R2() {
+        MoreKeysKeyboardParams params = createParams(7, 3, XPOS_R2);
+        assertEquals("7 key auto 3 R2 columns", 3, params.mNumColumns);
+        assertEquals("7 key auto 3 R2 rows", 3, params.mNumRows);
+        assertEquals("7 key auto 3 R2 left", 1, params.mLeftKeys);
+        assertEquals("7 key auto 3 R2 right", 2, params.mRightKeys);
+        assertEquals("7 key auto 3 R2 <1>", 0, params.getColumnPos(0));
+        assertEquals("7 key auto 3 R2 [2]", 1, params.getColumnPos(1));
+        assertEquals("7 key auto 3 R2 [3]", -1, params.getColumnPos(2));
+        assertEquals("7 key auto 3 R2 [4]", 0, params.getColumnPos(3));
+        assertEquals("7 key auto 3 R2 [5]", 1, params.getColumnPos(4));
+        assertEquals("7 key auto 3 R2 [6]", -1, params.getColumnPos(5));
+        assertEquals("7 key auto 3 R2 [7]", 0, params.getColumnPos(6));
+        assertEquals("7 key auto 3 R2 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("7 key auto 3 R2 default", WIDTH * 1, params.getDefaultKeyCoordX());
+    }
+
+    //     [8] [6] [7]
+    // [5] [3] <1> [2] [4]
+    public void testLayout8KeyAuto5M0() {
+        MoreKeysKeyboardParams params = createParams(8, 5, XPOS_M0);
+        assertEquals("8 key auto 5 M0 columns", 5, params.mNumColumns);
+        assertEquals("8 key auto 5 M0 rows", 2, params.mNumRows);
+        assertEquals("8 key auto 5 M0 left", 2, params.mLeftKeys);
+        assertEquals("8 key auto 5 M0 right", 3, params.mRightKeys);
+        assertEquals("8 key auto 5 M0 <1>", 0, params.getColumnPos(0));
+        assertEquals("8 key auto 5 M0 [2]", 1, params.getColumnPos(1));
+        assertEquals("8 key auto 5 M0 [3]", -1, params.getColumnPos(2));
+        assertEquals("8 key auto 5 M0 [4]", 2, params.getColumnPos(3));
+        assertEquals("8 key auto 5 M0 [5]", -2, params.getColumnPos(4));
+        assertEquals("8 key auto 5 M0 [6]", 0, params.getColumnPos(5));
+        assertEquals("8 key auto 5 M0 [7]", 1, params.getColumnPos(6));
+        assertEquals("8 key auto 5 M0 [8]", -1, params.getColumnPos(7));
+        assertEquals("8 key auto 5 M0 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("8 key auto 5 M0 default", WIDTH * 2, params.getDefaultKeyCoordX());
+    }
+
+    // |[6] [7] [8]
+    // |<1> [2] [3] [4] [5]
+    public void testLayout8KeyAuto5L0() {
+        MoreKeysKeyboardParams params = createParams(8, 5, XPOS_L0);
+        assertEquals("8 key auto 5 L0 columns", 5, params.mNumColumns);
+        assertEquals("8 key auto 5 L0 rows", 2, params.mNumRows);
+        assertEquals("8 key auto 5 L0 left", 0, params.mLeftKeys);
+        assertEquals("8 key auto 5 L0 right", 5, params.mRightKeys);
+        assertEquals("8 key auto 5 L0 <1>", 0, params.getColumnPos(0));
+        assertEquals("8 key auto 5 L0 [2]", 1, params.getColumnPos(1));
+        assertEquals("8 key auto 5 L0 [3]", 2, params.getColumnPos(2));
+        assertEquals("8 key auto 5 L0 [4]", 3, params.getColumnPos(3));
+        assertEquals("8 key auto 5 L0 [5]", 4, params.getColumnPos(4));
+        assertEquals("8 key auto 5 L0 [6]", 0, params.getColumnPos(5));
+        assertEquals("8 key auto 5 L0 [7]", 1, params.getColumnPos(6));
+        assertEquals("8 key auto 5 L0 [8]", 2, params.getColumnPos(7));
+        assertEquals("8 key auto 5 L0 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("8 key auto 5 L0 default", WIDTH * 0, params.getDefaultKeyCoordX());
+    }
+
+    // |___ [6] [7] [8]
+    // |___ <1> [2] [3] [4] [5]
+    public void testLayout8KeyAuto5L1() {
+        MoreKeysKeyboardParams params = createParams(8, 5, XPOS_L1);
+        assertEquals("8 key auto 5 L1 columns", 5, params.mNumColumns);
+        assertEquals("8 key auto 5 L1 rows", 2, params.mNumRows);
+        assertEquals("8 key auto 5 L1 left", 0, params.mLeftKeys);
+        assertEquals("8 key auto 5 L1 right", 5, params.mRightKeys);
+        assertEquals("8 key auto 5 L1 <1>", 0, params.getColumnPos(0));
+        assertEquals("8 key auto 5 L1 [2]", 1, params.getColumnPos(1));
+        assertEquals("8 key auto 5 L1 [3]", 2, params.getColumnPos(2));
+        assertEquals("8 key auto 5 L1 [4]", 3, params.getColumnPos(3));
+        assertEquals("8 key auto 5 L1 [5]", 4, params.getColumnPos(4));
+        assertEquals("8 key auto 5 L1 [6]", 0, params.getColumnPos(5));
+        assertEquals("8 key auto 5 L1 [7]", 1, params.getColumnPos(6));
+        assertEquals("8 key auto 5 L1 [8]", 2, params.getColumnPos(7));
+        assertEquals("8 key auto 5 L1 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("8 key auto 5 L1 default", WIDTH * 0, params.getDefaultKeyCoordX());
+    }
+
+    // |___ [8] [6] [7]
+    // |___ [3] <1> [2] [4] [5]
+    public void testLayout8KeyAuto5L2() {
+        MoreKeysKeyboardParams params = createParams(8, 5, XPOS_L2);
+        assertEquals("8 key auto 5 L2 columns", 5, params.mNumColumns);
+        assertEquals("8 key auto 5 L2 rows", 2, params.mNumRows);
+        assertEquals("8 key auto 5 L2 left", 1, params.mLeftKeys);
+        assertEquals("8 key auto 5 L2 right", 4, params.mRightKeys);
+        assertEquals("8 key auto 5 L2 <1>", 0, params.getColumnPos(0));
+        assertEquals("8 key auto 5 L2 [2]", 1, params.getColumnPos(1));
+        assertEquals("8 key auto 5 L2 [3]", -1, params.getColumnPos(2));
+        assertEquals("8 key auto 5 L2 [4]", 2, params.getColumnPos(3));
+        assertEquals("8 key auto 5 L2 [5]", 3, params.getColumnPos(4));
+        assertEquals("8 key auto 5 L2 [6]", 0, params.getColumnPos(5));
+        assertEquals("8 key auto 5 L2 [7]", 1, params.getColumnPos(6));
+        assertEquals("8 key auto 5 L2 [8]", -1, params.getColumnPos(7));
+        assertEquals("8 key auto 5 L2 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("8 key auto 5 L2 default", WIDTH * 1, params.getDefaultKeyCoordX());
+    }
+
+    //         [8] [7] [6]|
+    // [5] [4] [3] [2] <1>|
+    public void testLayout8KeyAuto5R0() {
+        MoreKeysKeyboardParams params = createParams(8, 5, XPOS_R0);
+        assertEquals("8 key auto 5 R0 columns", 5, params.mNumColumns);
+        assertEquals("8 key auto 5 R0 rows", 2, params.mNumRows);
+        assertEquals("8 key auto 5 R0 left", 4, params.mLeftKeys);
+        assertEquals("8 key auto 5 R0 right", 1, params.mRightKeys);
+        assertEquals("8 key auto 5 R0 <1>", 0, params.getColumnPos(0));
+        assertEquals("8 key auto 5 R0 [2]", -1, params.getColumnPos(1));
+        assertEquals("8 key auto 5 R0 [3]", -2, params.getColumnPos(2));
+        assertEquals("8 key auto 5 R0 [4]", -3, params.getColumnPos(3));
+        assertEquals("8 key auto 5 R0 [5]", -4, params.getColumnPos(4));
+        assertEquals("8 key auto 5 R0 [6]", 0, params.getColumnPos(5));
+        assertEquals("8 key auto 5 R0 [7]", -1, params.getColumnPos(6));
+        assertEquals("8 key auto 5 R0 [8]", -2, params.getColumnPos(7));
+        assertEquals("8 key auto 5 R0 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("8 key auto 5 R0 default", WIDTH * 4, params.getDefaultKeyCoordX());
+    }
+
+    //         [8] [7] [6] ___|
+    // [5] [4] [3] [2] <1> ___|
+    public void testLayout8KeyAuto5R1() {
+        MoreKeysKeyboardParams params = createParams(8, 5, XPOS_R1);
+        assertEquals("8 key auto 5 R1 columns", 5, params.mNumColumns);
+        assertEquals("8 key auto 5 R1 rows", 2, params.mNumRows);
+        assertEquals("8 key auto 5 R1 left", 4, params.mLeftKeys);
+        assertEquals("8 key auto 5 R1 right", 1, params.mRightKeys);
+        assertEquals("8 key auto 5 R1 <1>", 0, params.getColumnPos(0));
+        assertEquals("8 key auto 5 R1 [2]", -1, params.getColumnPos(1));
+        assertEquals("8 key auto 5 R1 [3]", -2, params.getColumnPos(2));
+        assertEquals("8 key auto 5 R1 [4]", -3, params.getColumnPos(3));
+        assertEquals("8 key auto 5 R1 [5]", -4, params.getColumnPos(4));
+        assertEquals("8 key auto 5 R1 [6]", 0, params.getColumnPos(5));
+        assertEquals("8 key auto 5 R1 [7]", -1, params.getColumnPos(6));
+        assertEquals("8 key auto 5 R1 [8]", -2, params.getColumnPos(7));
+        assertEquals("8 key auto 5 R1 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("8 key auto 5 R1 default", WIDTH * 4, params.getDefaultKeyCoordX());
+    }
+
+    //         [8] [6] [7] ___|
+    // [5] [4] [3] <1> [2] ___|
+    public void testLayout8KeyAuto5R2() {
+        MoreKeysKeyboardParams params = createParams(8, 5, XPOS_R2);
+        assertEquals("8 key auto 5 R2 columns", 5, params.mNumColumns);
+        assertEquals("8 key auto 5 R2 rows", 2, params.mNumRows);
+        assertEquals("8 key auto 5 R2 left", 3, params.mLeftKeys);
+        assertEquals("8 key auto 5 R2 right", 2, params.mRightKeys);
+        assertEquals("8 key auto 5 R2 <1>", 0, params.getColumnPos(0));
+        assertEquals("8 key auto 5 R2 [2]", 1, params.getColumnPos(1));
+        assertEquals("8 key auto 5 R2 [3]", -1, params.getColumnPos(2));
+        assertEquals("8 key auto 5 R2 [4]", -2, params.getColumnPos(3));
+        assertEquals("8 key auto 5 R2 [5]", -3, params.getColumnPos(4));
+        assertEquals("8 key auto 5 R2 [6]", 0, params.getColumnPos(5));
+        assertEquals("8 key auto 5 R2 [7]", 1, params.getColumnPos(6));
+        assertEquals("8 key auto 5 R2 [8]", -1, params.getColumnPos(7));
+        assertEquals("8 key auto 5 R2 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("8 key auto 5 R2 default", WIDTH * 3, params.getDefaultKeyCoordX());
+    }
+
+    //   [8] [6] [7] [9]
+    // [5] [3] <1> [2] [4]
+    public void testLayout9KeyAuto5M0() {
+        MoreKeysKeyboardParams params = createParams(9, 5, XPOS_M0);
+        assertEquals("9 key auto 5 M0 columns", 5, params.mNumColumns);
+        assertEquals("9 key auto 5 M0 rows", 2, params.mNumRows);
+        assertEquals("9 key auto 5 M0 left", 2, params.mLeftKeys);
+        assertEquals("9 key auto 5 M0 right", 3, params.mRightKeys);
+        assertEquals("9 key auto 5 M0 <1>", 0, params.getColumnPos(0));
+        assertEquals("9 key auto 5 M0 [2]", 1, params.getColumnPos(1));
+        assertEquals("9 key auto 5 M0 [3]", -1, params.getColumnPos(2));
+        assertEquals("9 key auto 5 M0 [4]", 2, params.getColumnPos(3));
+        assertEquals("9 key auto 5 M0 [5]", -2, params.getColumnPos(4));
+        assertEquals("9 key auto 5 M0 [6]", 0, params.getColumnPos(5));
+        assertEquals("9 key auto 5 M0 [7]", 1, params.getColumnPos(6));
+        assertEquals("9 key auto 5 M0 [8]", -1, params.getColumnPos(7));
+        assertEquals("9 key auto 5 M0 [9]", 2, params.getColumnPos(8));
+        assertEquals("9 key auto 5 M0 adjust", -1, params.mTopRowAdjustment);
+        assertEquals("9 key auto 5 M0 default", WIDTH * 2, params.getDefaultKeyCoordX());
+    }
+
+    // |[6] [7] [8] [9]
+    // |<1> [2] [3] [4] [5]
+    public void testLayout9KeyAuto5L0() {
+        MoreKeysKeyboardParams params = createParams(9, 5, XPOS_L0);
+        assertEquals("9 key auto 5 L0 columns", 5, params.mNumColumns);
+        assertEquals("9 key auto 5 L0 rows", 2, params.mNumRows);
+        assertEquals("9 key auto 5 L0 left", 0, params.mLeftKeys);
+        assertEquals("9 key auto 5 L0 right", 5, params.mRightKeys);
+        assertEquals("9 key auto 5 L0 <1>", 0, params.getColumnPos(0));
+        assertEquals("9 key auto 5 L0 [2]", 1, params.getColumnPos(1));
+        assertEquals("9 key auto 5 L0 [3]", 2, params.getColumnPos(2));
+        assertEquals("9 key auto 5 L0 [4]", 3, params.getColumnPos(3));
+        assertEquals("9 key auto 5 L0 [5]", 4, params.getColumnPos(4));
+        assertEquals("9 key auto 5 L0 [6]", 0, params.getColumnPos(5));
+        assertEquals("9 key auto 5 L0 [7]", 1, params.getColumnPos(6));
+        assertEquals("9 key auto 5 L0 [8]", 2, params.getColumnPos(7));
+        assertEquals("9 key auto 5 L0 [9]", 3, params.getColumnPos(8));
+        assertEquals("9 key auto 5 L0 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("9 key auto 5 L0 default", WIDTH * 0, params.getDefaultKeyCoordX());
+    }
+
+    // |___ [6] [7] [8] [9]
+    // |___ <1> [2] [3] [4] [5]
+    public void testLayout9KeyAuto5L1() {
+        MoreKeysKeyboardParams params = createParams(9, 5, XPOS_L1);
+        assertEquals("9 key auto 5 L1 columns", 5, params.mNumColumns);
+        assertEquals("9 key auto 5 L1 rows", 2, params.mNumRows);
+        assertEquals("9 key auto 5 L1 left", 0, params.mLeftKeys);
+        assertEquals("9 key auto 5 L1 right", 5, params.mRightKeys);
+        assertEquals("9 key auto 5 L1 <1>", 0, params.getColumnPos(0));
+        assertEquals("9 key auto 5 L1 [2]", 1, params.getColumnPos(1));
+        assertEquals("9 key auto 5 L1 [3]", 2, params.getColumnPos(2));
+        assertEquals("9 key auto 5 L1 [4]", 3, params.getColumnPos(3));
+        assertEquals("9 key auto 5 L1 [5]", 4, params.getColumnPos(4));
+        assertEquals("9 key auto 5 L1 [6]", 0, params.getColumnPos(5));
+        assertEquals("9 key auto 5 L1 [7]", 1, params.getColumnPos(6));
+        assertEquals("9 key auto 5 L1 [8]", 2, params.getColumnPos(7));
+        assertEquals("9 key auto 5 L1 [9]", 3, params.getColumnPos(8));
+        assertEquals("9 key auto 5 L1 adjust",0, params.mTopRowAdjustment);
+        assertEquals("9 key auto 5 L1 default", WIDTH * 0, params.getDefaultKeyCoordX());
+    }
+
+    // |___   [6] [7] [8] [9]
+    // |___ [3] <1> [2] [4] [5]
+    public void testLayout9KeyAuto5L2() {
+        MoreKeysKeyboardParams params = createParams(9, 5, XPOS_L2);
+        assertEquals("9 key auto 5 L2 columns", 5, params.mNumColumns);
+        assertEquals("9 key auto 5 L2 rows", 2, params.mNumRows);
+        assertEquals("9 key auto 5 L2 left", 1, params.mLeftKeys);
+        assertEquals("9 key auto 5 L2 right", 4, params.mRightKeys);
+        assertEquals("9 key auto 5 L2 <1>", 0, params.getColumnPos(0));
+        assertEquals("9 key auto 5 L2 [2]", 1, params.getColumnPos(1));
+        assertEquals("9 key auto 5 L2 [3]", -1, params.getColumnPos(2));
+        assertEquals("9 key auto 5 L2 [4]", 2, params.getColumnPos(3));
+        assertEquals("9 key auto 5 L2 [5]", 3, params.getColumnPos(4));
+        assertEquals("9 key auto 5 L2 [6]", 0, params.getColumnPos(5));
+        assertEquals("9 key auto 5 L2 [7]", 1, params.getColumnPos(6));
+        assertEquals("9 key auto 5 L2 [8]", 2, params.getColumnPos(7));
+        assertEquals("9 key auto 5 L2 [9]", 3, params.getColumnPos(8));
+        assertEquals("9 key auto 5 L2 adjust", -1, params.mTopRowAdjustment);
+        assertEquals("9 key auto 5 L2 default", WIDTH * 1, params.getDefaultKeyCoordX());
+    }
+
+    //     [9] [8] [7] [6]|
+    // [5] [4] [3] [2] <1>|
+    public void testLayout9KeyAuto5R0() {
+        MoreKeysKeyboardParams params = createParams(9, 5, XPOS_R0);
+        assertEquals("9 key auto 5 R0 columns", 5, params.mNumColumns);
+        assertEquals("9 key auto 5 R0 rows", 2, params.mNumRows);
+        assertEquals("9 key auto 5 R0 left", 4, params.mLeftKeys);
+        assertEquals("9 key auto 5 R0 right", 1, params.mRightKeys);
+        assertEquals("9 key auto 5 R0 <1>", 0, params.getColumnPos(0));
+        assertEquals("9 key auto 5 R0 [2]", -1, params.getColumnPos(1));
+        assertEquals("9 key auto 5 R0 [3]", -2, params.getColumnPos(2));
+        assertEquals("9 key auto 5 R0 [4]", -3, params.getColumnPos(3));
+        assertEquals("9 key auto 5 R0 [5]", -4, params.getColumnPos(4));
+        assertEquals("9 key auto 5 R0 [6]", 0, params.getColumnPos(5));
+        assertEquals("9 key auto 5 R0 [7]", -1, params.getColumnPos(6));
+        assertEquals("9 key auto 5 R0 [8]", -2, params.getColumnPos(7));
+        assertEquals("9 key auto 5 R0 [9]", -3, params.getColumnPos(8));
+        assertEquals("9 key auto 5 R0 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("9 key auto 5 R0 default", WIDTH * 4, params.getDefaultKeyCoordX());
+    }
+
+    //     [9] [8] [7] [6] ___|
+    // [5] [4] [3] [2] <1> ___|
+    public void testLayout9KeyAuto5R1() {
+        MoreKeysKeyboardParams params = createParams(9, 5, XPOS_R1);
+        assertEquals("9 key auto 5 R1 columns", 5, params.mNumColumns);
+        assertEquals("9 key auto 5 R1 rows", 2, params.mNumRows);
+        assertEquals("9 key auto 5 R1 left", 4, params.mLeftKeys);
+        assertEquals("9 key auto 5 R1 right", 1, params.mRightKeys);
+        assertEquals("9 key auto 5 R1 <1>", 0, params.getColumnPos(0));
+        assertEquals("9 key auto 5 R1 [2]", -1, params.getColumnPos(1));
+        assertEquals("9 key auto 5 R1 [3]", -2, params.getColumnPos(2));
+        assertEquals("9 key auto 5 R1 [4]", -3, params.getColumnPos(3));
+        assertEquals("9 key auto 5 R1 [5]", -4, params.getColumnPos(4));
+        assertEquals("9 key auto 5 R1 [6]", 0, params.getColumnPos(5));
+        assertEquals("9 key auto 5 R1 [7]", -1, params.getColumnPos(6));
+        assertEquals("9 key auto 5 R1 [8]", -2, params.getColumnPos(7));
+        assertEquals("9 key auto 5 R1 [9]", -3, params.getColumnPos(8));
+        assertEquals("9 key auto 5 R1 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("9 key auto 5 R1 default", WIDTH * 4, params.getDefaultKeyCoordX());
+    }
+
+    //   [9] [8] [6] [7]   ___|
+    // [5] [4] [3] <1> [2] ___|
+    public void testLayout9KeyAuto5R2() {
+        MoreKeysKeyboardParams params = createParams(9, 5, XPOS_R2);
+        assertEquals("9 key auto 5 R2 columns", 5, params.mNumColumns);
+        assertEquals("9 key auto 5 R2 rows", 2, params.mNumRows);
+        assertEquals("9 key auto 5 R2 left", 3, params.mLeftKeys);
+        assertEquals("9 key auto 5 R2 right", 2, params.mRightKeys);
+        assertEquals("9 key auto 5 R2 <1>", 0, params.getColumnPos(0));
+        assertEquals("9 key auto 5 R2 [2]", 1, params.getColumnPos(1));
+        assertEquals("9 key auto 5 R2 [3]", -1, params.getColumnPos(2));
+        assertEquals("9 key auto 5 R2 [4]", -2, params.getColumnPos(3));
+        assertEquals("9 key auto 5 R2 [5]", -3, params.getColumnPos(4));
+        assertEquals("9 key auto 5 R2 [6]", 0, params.getColumnPos(5));
+        assertEquals("9 key auto 5 R2 [7]", 1, params.getColumnPos(6));
+        assertEquals("9 key auto 5 R2 [8]", -1, params.getColumnPos(7));
+        assertEquals("9 key auto 5 R2 [9]", -2, params.getColumnPos(8));
+        assertEquals("9 key auto 5 R2 adjust", -1, params.mTopRowAdjustment);
+        assertEquals("9 key auto 5 R2 default", WIDTH * 3, params.getDefaultKeyCoordX());
+    }
+
+    // [A] [8] [6] [7] [9]
+    // [5] [3] <1> [2] [4]
+    public void testLayout10KeyAuto5M0() {
+        MoreKeysKeyboardParams params = createParams(10, 5, XPOS_M0);
+        assertEquals("10 key auto 5 M0 columns", 5, params.mNumColumns);
+        assertEquals("10 key auto 5 M0 rows", 2, params.mNumRows);
+        assertEquals("10 key auto 5 M0 left", 2, params.mLeftKeys);
+        assertEquals("10 key auto 5 M0 right", 3, params.mRightKeys);
+        assertEquals("10 key auto 5 M0 <1>", 0, params.getColumnPos(0));
+        assertEquals("10 key auto 5 M0 [2]", 1, params.getColumnPos(1));
+        assertEquals("10 key auto 5 M0 [3]", -1, params.getColumnPos(2));
+        assertEquals("10 key auto 5 M0 [4]", 2, params.getColumnPos(3));
+        assertEquals("10 key auto 5 M0 [5]", -2, params.getColumnPos(4));
+        assertEquals("10 key auto 5 M0 [6]", 0, params.getColumnPos(5));
+        assertEquals("10 key auto 5 M0 [7]", 1, params.getColumnPos(6));
+        assertEquals("10 key auto 5 M0 [8]", -1, params.getColumnPos(7));
+        assertEquals("10 key auto 5 M0 [9]", 2, params.getColumnPos(8));
+        assertEquals("10 key auto 5 M0 [A]", -2, params.getColumnPos(9));
+        assertEquals("10 key auto 5 M0 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("10 key auto 5 M0 default", WIDTH * 2, params.getDefaultKeyCoordX());
+    }
+
+    // |[6] [7] [8] [9] [A]
+    // |<1> [2] [3] [4] [5]
+    public void testLayout10KeyAuto5L0() {
+        MoreKeysKeyboardParams params = createParams(10, 5, XPOS_L0);
+        assertEquals("10 key auto 5 L0 columns", 5, params.mNumColumns);
+        assertEquals("10 key auto 5 L0 rows", 2, params.mNumRows);
+        assertEquals("10 key auto 5 L0 left", 0, params.mLeftKeys);
+        assertEquals("10 key auto 5 L0 right", 5, params.mRightKeys);
+        assertEquals("10 key auto 5 L0 <1>", 0, params.getColumnPos(0));
+        assertEquals("10 key auto 5 L0 [2]", 1, params.getColumnPos(1));
+        assertEquals("10 key auto 5 L0 [3]", 2, params.getColumnPos(2));
+        assertEquals("10 key auto 5 L0 [4]", 3, params.getColumnPos(3));
+        assertEquals("10 key auto 5 L0 [5]", 4, params.getColumnPos(4));
+        assertEquals("10 key auto 5 L0 [6]", 0, params.getColumnPos(5));
+        assertEquals("10 key auto 5 L0 [7]", 1, params.getColumnPos(6));
+        assertEquals("10 key auto 5 L0 [8]", 2, params.getColumnPos(7));
+        assertEquals("10 key auto 5 L0 [9]", 3, params.getColumnPos(8));
+        assertEquals("10 key auto 5 L0 [A]", 4, params.getColumnPos(9));
+        assertEquals("10 key auto 5 L0 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("10 key auto 5 L0 default", WIDTH * 0, params.getDefaultKeyCoordX());
+    }
+
+    // |___ [6] [7] [8] [9] [A]
+    // |___ <1> [2] [3] [4] [5]
+    public void testLayout10KeyAuto5L1() {
+        MoreKeysKeyboardParams params = createParams(10, 5, XPOS_L1);
+        assertEquals("10 key auto 5 L1 columns", 5, params.mNumColumns);
+        assertEquals("10 key auto 5 L1 rows", 2, params.mNumRows);
+        assertEquals("10 key auto 5 L1 left", 0, params.mLeftKeys);
+        assertEquals("10 key auto 5 L1 right", 5, params.mRightKeys);
+        assertEquals("10 key auto 5 L1 <1>", 0, params.getColumnPos(0));
+        assertEquals("10 key auto 5 L1 [2]", 1, params.getColumnPos(1));
+        assertEquals("10 key auto 5 L1 [3]", 2, params.getColumnPos(2));
+        assertEquals("10 key auto 5 L1 [4]", 3, params.getColumnPos(3));
+        assertEquals("10 key auto 5 L1 [5]", 4, params.getColumnPos(4));
+        assertEquals("10 key auto 5 L1 [6]", 0, params.getColumnPos(5));
+        assertEquals("10 key auto 5 L1 [7]", 1, params.getColumnPos(6));
+        assertEquals("10 key auto 5 L1 [8]", 2, params.getColumnPos(7));
+        assertEquals("10 key auto 5 L1 [9]", 3, params.getColumnPos(8));
+        assertEquals("10 key auto 5 L1 [A]", 4, params.getColumnPos(9));
+        assertEquals("10 key auto 5 L1 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("10 key auto 5 L1 default", WIDTH * 0, params.getDefaultKeyCoordX());
+    }
+
+    // |___ [8] [6] [7] [9] [A]
+    // |___ [3] <1> [2] [4] [5]
+    public void testLayout10KeyAuto5L2() {
+        MoreKeysKeyboardParams params = createParams(10, 5, XPOS_L2);
+        assertEquals("10 key auto 5 L2 columns", 5, params.mNumColumns);
+        assertEquals("10 key auto 5 L2 rows", 2, params.mNumRows);
+        assertEquals("10 key auto 5 L2 left", 1, params.mLeftKeys);
+        assertEquals("10 key auto 5 L2 right", 4, params.mRightKeys);
+        assertEquals("10 key auto 5 L2 <1>", 0, params.getColumnPos(0));
+        assertEquals("10 key auto 5 L2 [2]", 1, params.getColumnPos(1));
+        assertEquals("10 key auto 5 L2 [3]", -1, params.getColumnPos(2));
+        assertEquals("10 key auto 5 L2 [4]", 2, params.getColumnPos(3));
+        assertEquals("10 key auto 5 L2 [5]", 3, params.getColumnPos(4));
+        assertEquals("10 key auto 5 L2 [6]", 0, params.getColumnPos(5));
+        assertEquals("10 key auto 5 L2 [7]", 1, params.getColumnPos(6));
+        assertEquals("10 key auto 5 L2 [8]", -1, params.getColumnPos(7));
+        assertEquals("10 key auto 5 L2 [9]", 2, params.getColumnPos(8));
+        assertEquals("10 key auto 5 L2 [A]", 3, params.getColumnPos(9));
+        assertEquals("10 key auto 5 L2 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("10 key auto 5 L2 default", WIDTH * 1, params.getDefaultKeyCoordX());
+    }
+
+    // [A] [9] [8] [7] [6]|
+    // [5] [4] [3] [2] <1>|
+    public void testLayout10KeyAuto5R0() {
+        MoreKeysKeyboardParams params = createParams(10, 5, XPOS_R0);
+        assertEquals("10 key auto 5 R0 columns", 5, params.mNumColumns);
+        assertEquals("10 key auto 5 R0 rows", 2, params.mNumRows);
+        assertEquals("10 key auto 5 R0 left", 4, params.mLeftKeys);
+        assertEquals("10 key auto 5 R0 right", 1, params.mRightKeys);
+        assertEquals("10 key auto 5 R0 <1>", 0, params.getColumnPos(0));
+        assertEquals("10 key auto 5 R0 [2]", -1, params.getColumnPos(1));
+        assertEquals("10 key auto 5 R0 [3]", -2, params.getColumnPos(2));
+        assertEquals("10 key auto 5 R0 [4]", -3, params.getColumnPos(3));
+        assertEquals("10 key auto 5 R0 [5]", -4, params.getColumnPos(4));
+        assertEquals("10 key auto 5 R0 [6]", 0, params.getColumnPos(5));
+        assertEquals("10 key auto 5 R0 [7]", -1, params.getColumnPos(6));
+        assertEquals("10 key auto 5 R0 [8]", -2, params.getColumnPos(7));
+        assertEquals("10 key auto 5 R0 [9]", -3, params.getColumnPos(8));
+        assertEquals("10 key auto 5 R0 [A]", -4, params.getColumnPos(9));
+        assertEquals("10 key auto 5 R0 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("10 key auto 5 R0 default", WIDTH * 4, params.getDefaultKeyCoordX());
+    }
+
+    // [A] [9] [8] [7] [6] ___|
+    // [5] [4] [3] [2] <1> ___|
+    public void testLayout10KeyAuto5R1() {
+        MoreKeysKeyboardParams params = createParams(10, 5, XPOS_R1);
+        assertEquals("10 key auto 5 R1 columns", 5, params.mNumColumns);
+        assertEquals("10 key auto 5 R1 rows", 2, params.mNumRows);
+        assertEquals("10 key auto 5 R1 left", 4, params.mLeftKeys);
+        assertEquals("10 key auto 5 R1 right", 1, params.mRightKeys);
+        assertEquals("10 key auto 5 R1 <1>", 0, params.getColumnPos(0));
+        assertEquals("10 key auto 5 R1 [2]", -1, params.getColumnPos(1));
+        assertEquals("10 key auto 5 R1 [3]", -2, params.getColumnPos(2));
+        assertEquals("10 key auto 5 R1 [4]", -3, params.getColumnPos(3));
+        assertEquals("10 key auto 5 R1 [5]", -4, params.getColumnPos(4));
+        assertEquals("10 key auto 5 R1 [6]", 0, params.getColumnPos(5));
+        assertEquals("10 key auto 5 R1 [7]", -1, params.getColumnPos(6));
+        assertEquals("10 key auto 5 R1 [8]", -2, params.getColumnPos(7));
+        assertEquals("10 key auto 5 R1 [9]", -3, params.getColumnPos(8));
+        assertEquals("10 key auto 5 R1 [A]", -4, params.getColumnPos(9));
+        assertEquals("10 key auto 5 R1 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("10 key auto 5 R1 default", WIDTH * 4, params.getDefaultKeyCoordX());
+    }
+
+    // [A] [9] [8] [6] [7] ___|
+    // [5] [4] [3] <1> [2] ___|
+    public void testLayout10KeyAuto5R2() {
+        MoreKeysKeyboardParams params = createParams(10, 5, XPOS_R2);
+        assertEquals("10 key auto 5 R2 columns", 5, params.mNumColumns);
+        assertEquals("10 key auto 5 R2 rows", 2, params.mNumRows);
+        assertEquals("10 key auto 5 R2 left", 3, params.mLeftKeys);
+        assertEquals("10 key auto 5 R2 right", 2, params.mRightKeys);
+        assertEquals("10 key auto 5 R2 <1>", 0, params.getColumnPos(0));
+        assertEquals("10 key auto 5 R2 [2]", 1, params.getColumnPos(1));
+        assertEquals("10 key auto 5 R2 [3]", -1, params.getColumnPos(2));
+        assertEquals("10 key auto 5 R2 [4]", -2, params.getColumnPos(3));
+        assertEquals("10 key auto 5 R2 [5]", -3, params.getColumnPos(4));
+        assertEquals("10 key auto 5 R2 [6]", 0, params.getColumnPos(5));
+        assertEquals("10 key auto 5 R2 [7]", 1, params.getColumnPos(6));
+        assertEquals("10 key auto 5 R2 [8]", -1, params.getColumnPos(7));
+        assertEquals("10 key auto 5 R2 [9]", -2, params.getColumnPos(8));
+        assertEquals("10 key auto 5 R2 [A]", -3, params.getColumnPos(9));
+        assertEquals("10 key auto 5 R2 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("10 key auto 5 R2 default", WIDTH * 3, params.getDefaultKeyCoordX());
+    }
+
+    //         [B]
+    // [A] [8] [6] [7] [9]
+    // [5] [3] <1> [2] [4]
+    public void testLayout11KeyAuto5M0() {
+        MoreKeysKeyboardParams params = createParams(11, 5, XPOS_M0);
+        assertEquals("11 key auto 5 M0 columns", 5, params.mNumColumns);
+        assertEquals("11 key auto 5 M0 rows", 3, params.mNumRows);
+        assertEquals("11 key auto 5 M0 left", 2, params.mLeftKeys);
+        assertEquals("11 key auto 5 M0 right", 3, params.mRightKeys);
+        assertEquals("11 key auto 5 M0 <1>", 0, params.getColumnPos(0));
+        assertEquals("11 key auto 5 M0 [2]", 1, params.getColumnPos(1));
+        assertEquals("11 key auto 5 M0 [3]", -1, params.getColumnPos(2));
+        assertEquals("11 key auto 5 M0 [4]", 2, params.getColumnPos(3));
+        assertEquals("11 key auto 5 M0 [5]", -2, params.getColumnPos(4));
+        assertEquals("11 key auto 5 M0 [6]", 0, params.getColumnPos(5));
+        assertEquals("11 key auto 5 M0 [7]", 1, params.getColumnPos(6));
+        assertEquals("11 key auto 5 M0 [8]", -1, params.getColumnPos(7));
+        assertEquals("11 key auto 5 M0 [9]", 2, params.getColumnPos(8));
+        assertEquals("11 key auto 5 M0 [A]", -2, params.getColumnPos(9));
+        assertEquals("11 key auto 5 M0 [B]", 0, params.getColumnPos(10));
+        assertEquals("11 key auto 5 M0 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("11 key auto 5 M0 default", WIDTH * 2, params.getDefaultKeyCoordX());
+    }
+
+    //       [B] [C]
+    // [A] [8] [6] [7] [9]
+    // [5] [3] <1> [2] [4]
+    public void testLayout12KeyAuto5M0() {
+        MoreKeysKeyboardParams params = createParams(12, 5, XPOS_M0);
+        assertEquals("12 key auto 5 M0 columns", 5, params.mNumColumns);
+        assertEquals("12 key auto 5 M0 rows", 3, params.mNumRows);
+        assertEquals("12 key auto 5 M0 left", 2, params.mLeftKeys);
+        assertEquals("12 key auto 5 M0 right", 3, params.mRightKeys);
+        assertEquals("12 key auto 5 M0 <1>", 0, params.getColumnPos(0));
+        assertEquals("12 key auto 5 M0 [2]", 1, params.getColumnPos(1));
+        assertEquals("12 key auto 5 M0 [3]", -1, params.getColumnPos(2));
+        assertEquals("12 key auto 5 M0 [4]", 2, params.getColumnPos(3));
+        assertEquals("12 key auto 5 M0 [5]", -2, params.getColumnPos(4));
+        assertEquals("12 key auto 5 M0 [6]", 0, params.getColumnPos(5));
+        assertEquals("12 key auto 5 M0 [7]", 1, params.getColumnPos(6));
+        assertEquals("12 key auto 5 M0 [8]", -1, params.getColumnPos(7));
+        assertEquals("12 key auto 5 M0 [9]", 2, params.getColumnPos(8));
+        assertEquals("12 key auto 5 M0 [A]", -2, params.getColumnPos(9));
+        assertEquals("12 key auto 5 M0 [B]", 0, params.getColumnPos(10));
+        assertEquals("12 key auto 5 M0 [C]", 1, params.getColumnPos(11));
+        assertEquals("12 key auto 5 M0 adjust", -1, params.mTopRowAdjustment);
+        assertEquals("12 key auto 5 M0 default", WIDTH * 2, params.getDefaultKeyCoordX());
+    }
+
+    //     [D] [B] [C]
+    // [A] [8] [6] [7] [9]
+    // [5] [3] <1> [2] [4]
+    public void testLayout13KeyAuto5M0() {
+        MoreKeysKeyboardParams params = createParams(13, 5, XPOS_M0);
+        assertEquals("13 key auto 5 M0 columns", 5, params.mNumColumns);
+        assertEquals("13 key auto 5 M0 rows", 3, params.mNumRows);
+        assertEquals("13 key auto 5 M0 left", 2, params.mLeftKeys);
+        assertEquals("13 key auto 5 M0 right", 3, params.mRightKeys);
+        assertEquals("13 key auto 5 M0 <1>", 0, params.getColumnPos(0));
+        assertEquals("13 key auto 5 M0 [2]", 1, params.getColumnPos(1));
+        assertEquals("13 key auto 5 M0 [3]", -1, params.getColumnPos(2));
+        assertEquals("13 key auto 5 M0 [4]", 2, params.getColumnPos(3));
+        assertEquals("13 key auto 5 M0 [5]", -2, params.getColumnPos(4));
+        assertEquals("13 key auto 5 M0 [6]", 0, params.getColumnPos(5));
+        assertEquals("13 key auto 5 M0 [7]", 1, params.getColumnPos(6));
+        assertEquals("13 key auto 5 M0 [8]", -1, params.getColumnPos(7));
+        assertEquals("13 key auto 5 M0 [9]", 2, params.getColumnPos(8));
+        assertEquals("13 key auto 5 M0 [A]", -2, params.getColumnPos(9));
+        assertEquals("13 key auto 5 M0 [B]", 0, params.getColumnPos(10));
+        assertEquals("13 key auto 5 M0 [C]", 1, params.getColumnPos(11));
+        assertEquals("13 key auto 5 M0 [D]", -1, params.getColumnPos(12));
+        assertEquals("13 key auto 5 M0 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("13 key auto 5 M0 default", WIDTH * 2, params.getDefaultKeyCoordX());
+    }
+
+    //   [D] [B] [C] [E]
+    // [A] [8] [6] [7] [9]
+    // [5] [3] <1> [2] [4]
+    public void testLayout14KeyAuto5M0() {
+        MoreKeysKeyboardParams params = createParams(14, 5, XPOS_M0);
+        assertEquals("13 key auto 5 M0 columns", 5, params.mNumColumns);
+        assertEquals("13 key auto 5 M0 rows", 3, params.mNumRows);
+        assertEquals("13 key auto 5 M0 left", 2, params.mLeftKeys);
+        assertEquals("13 key auto 5 M0 right", 3, params.mRightKeys);
+        assertEquals("13 key auto 5 M0 <1>", 0, params.getColumnPos(0));
+        assertEquals("13 key auto 5 M0 [2]", 1, params.getColumnPos(1));
+        assertEquals("13 key auto 5 M0 [3]", -1, params.getColumnPos(2));
+        assertEquals("13 key auto 5 M0 [4]", 2, params.getColumnPos(3));
+        assertEquals("13 key auto 5 M0 [5]", -2, params.getColumnPos(4));
+        assertEquals("13 key auto 5 M0 [6]", 0, params.getColumnPos(5));
+        assertEquals("13 key auto 5 M0 [7]", 1, params.getColumnPos(6));
+        assertEquals("13 key auto 5 M0 [8]", -1, params.getColumnPos(7));
+        assertEquals("13 key auto 5 M0 [9]", 2, params.getColumnPos(8));
+        assertEquals("13 key auto 5 M0 [A]", -2, params.getColumnPos(9));
+        assertEquals("13 key auto 5 M0 [B]", 0, params.getColumnPos(10));
+        assertEquals("13 key auto 5 M0 [C]", 1, params.getColumnPos(11));
+        assertEquals("13 key auto 5 M0 [D]", -1, params.getColumnPos(12));
+        assertEquals("13 key auto 5 M0 [E]", 2, params.getColumnPos(13));
+        assertEquals("13 key auto 5 M0 adjust", -1, params.mTopRowAdjustment);
+        assertEquals("13 key auto 5 M0 default", WIDTH * 2, params.getDefaultKeyCoordX());
+    }
+
+    //                     [J] [I] [H] ___|
+    // [G] [F] [E] [D] [C] [B] [A] [9] ___|
+    // [8] [7] [6] [5] [4] [3] [2] <1> ___|
+    public void testLayout19KeyAuto8R1() {
+        MoreKeysKeyboardParams params = createParams(19, 8, XPOS_R1);
+        assertEquals("19 key auto 8 R1 columns", 8, params.mNumColumns);
+        assertEquals("19 key auto 8 R1 rows", 3, params.mNumRows);
+        assertEquals("19 key auto 8 R1 left", 7, params.mLeftKeys);
+        assertEquals("19 key auto 8 R1 right", 1, params.mRightKeys);
+        assertEquals("19 key auto 8 R1 <1>", 0, params.getColumnPos(0));
+        assertEquals("19 key auto 8 R1 [2]", -1, params.getColumnPos(1));
+        assertEquals("19 key auto 8 R1 [3]", -2, params.getColumnPos(2));
+        assertEquals("19 key auto 8 R1 [4]", -3, params.getColumnPos(3));
+        assertEquals("19 key auto 8 R1 [5]", -4, params.getColumnPos(4));
+        assertEquals("19 key auto 8 R1 [6]", -5, params.getColumnPos(5));
+        assertEquals("19 key auto 8 R1 [7]", -6, params.getColumnPos(6));
+        assertEquals("19 key auto 8 R1 [8]", -7, params.getColumnPos(7));
+        assertEquals("19 key auto 8 R1 [9]", 0, params.getColumnPos(8));
+        assertEquals("19 key auto 8 R1 [A]", -1, params.getColumnPos(9));
+        assertEquals("19 key auto 8 R1 [B]", -2, params.getColumnPos(10));
+        assertEquals("19 key auto 8 R1 [C]", -3, params.getColumnPos(11));
+        assertEquals("19 key auto 8 R1 [D]", -4, params.getColumnPos(12));
+        assertEquals("19 key auto 8 R1 [E]", -5, params.getColumnPos(13));
+        assertEquals("19 key auto 8 R1 [F]", -6, params.getColumnPos(14));
+        assertEquals("19 key auto 8 R1 [G]", -7, params.getColumnPos(15));
+        assertEquals("19 key auto 8 R1 [H]", 0, params.getColumnPos(16));
+        assertEquals("19 key auto 8 R1 [I]", -1, params.getColumnPos(17));
+        assertEquals("19 key auto 8 R1 [J]", -2, params.getColumnPos(18));
+        assertEquals("19 key auto 8 R1 adjust", 0, params.mTopRowAdjustment);
+        assertEquals("19 key auto 8 R1 default", WIDTH * 7, params.getDefaultKeyCoordX());
+    }
+
+    //                   [J] [H] [I]   ___|
+    // [G] [F] [E] [D] [C] [B] [9] [A] ___|
+    // [8] [7] [6] [5] [4] [3] <1> [2] ___|
+    public void testLayout19KeyAuto8R2() {
+        MoreKeysKeyboardParams params = createParams(19, 8, XPOS_R2);
+        assertEquals("19 key auto 8 R2 columns", 8, params.mNumColumns);
+        assertEquals("19 key auto 8 R2 rows", 3, params.mNumRows);
+        assertEquals("19 key auto 8 R2 left", 6, params.mLeftKeys);
+        assertEquals("19 key auto 8 R2 right", 2, params.mRightKeys);
+        assertEquals("19 key auto 8 R2 <1>", 0, params.getColumnPos(0));
+        assertEquals("19 key auto 8 R2 [2]", 1, params.getColumnPos(1));
+        assertEquals("19 key auto 8 R2 [3]", -1, params.getColumnPos(2));
+        assertEquals("19 key auto 8 R2 [4]", -2, params.getColumnPos(3));
+        assertEquals("19 key auto 8 R2 [5]", -3, params.getColumnPos(4));
+        assertEquals("19 key auto 8 R2 [6]", -4, params.getColumnPos(5));
+        assertEquals("19 key auto 8 R2 [7]", -5, params.getColumnPos(6));
+        assertEquals("19 key auto 8 R2 [8]", -6, params.getColumnPos(7));
+        assertEquals("19 key auto 8 R2 [9]", 0, params.getColumnPos(8));
+        assertEquals("19 key auto 8 R2 [A]", 1, params.getColumnPos(9));
+        assertEquals("19 key auto 8 R2 [B]", -1, params.getColumnPos(10));
+        assertEquals("19 key auto 8 R2 [C]", -2, params.getColumnPos(11));
+        assertEquals("19 key auto 8 R2 [D]", -3, params.getColumnPos(12));
+        assertEquals("19 key auto 8 R2 [E]", -4, params.getColumnPos(13));
+        assertEquals("19 key auto 8 R2 [F]", -5, params.getColumnPos(14));
+        assertEquals("19 key auto 8 R2 [G]", -6, params.getColumnPos(15));
+        assertEquals("19 key auto 8 R2 [H]", 0, params.getColumnPos(16));
+        assertEquals("19 key auto 8 R2 [I]", 1, params.getColumnPos(17));
+        assertEquals("19 key auto 8 R2 [J]", -1, params.getColumnPos(18));
+        assertEquals("19 key auto 8 R2 adjust", -1, params.mTopRowAdjustment);
+        assertEquals("19 key auto 8 R2 default", WIDTH * 6, params.getDefaultKeyCoordX());
+    }
+
+    //               [J] [H] [I]       ___|
+    // [G] [F] [E] [D] [B] [9] [A] [C] ___|
+    // [8] [7] [6] [5] [3] <1> [2] [4] ___|
+    public void testLayout19KeyAuto8R3() {
+        MoreKeysKeyboardParams params = createParams(19, 8, XPOS_R3);
+        assertEquals("19 key auto 8 R3 columns", 8, params.mNumColumns);
+        assertEquals("19 key auto 8 R3 rows", 3, params.mNumRows);
+        assertEquals("19 key auto 8 R3 left", 5, params.mLeftKeys);
+        assertEquals("19 key auto 8 R3 right", 3, params.mRightKeys);
+        assertEquals("19 key auto 8 R3 <1>", 0, params.getColumnPos(0));
+        assertEquals("19 key auto 8 R3 [2]", 1, params.getColumnPos(1));
+        assertEquals("19 key auto 8 R3 [3]", -1, params.getColumnPos(2));
+        assertEquals("19 key auto 8 R3 [4]", 2, params.getColumnPos(3));
+        assertEquals("19 key auto 8 R3 [5]", -2, params.getColumnPos(4));
+        assertEquals("19 key auto 8 R3 [6]", -3, params.getColumnPos(5));
+        assertEquals("19 key auto 8 R3 [7]", -4, params.getColumnPos(6));
+        assertEquals("19 key auto 8 R3 [8]", -5, params.getColumnPos(7));
+        assertEquals("19 key auto 8 R3 [9]", 0, params.getColumnPos(8));
+        assertEquals("19 key auto 8 R3 [A]", 1, params.getColumnPos(9));
+        assertEquals("19 key auto 8 R3 [B]", -1, params.getColumnPos(10));
+        assertEquals("19 key auto 8 R3 [C]", 2, params.getColumnPos(11));
+        assertEquals("19 key auto 8 R3 [D]", -2, params.getColumnPos(12));
+        assertEquals("19 key auto 8 R3 [E]", -3, params.getColumnPos(13));
+        assertEquals("19 key auto 8 R3 [F]", -4, params.getColumnPos(14));
+        assertEquals("19 key auto 8 R3 [G]", -5, params.getColumnPos(15));
+        assertEquals("19 key auto 8 R3 [H]", 0, params.getColumnPos(16));
+        assertEquals("19 key auto 8 R3 [I]", 1, params.getColumnPos(17));
+        assertEquals("19 key auto 8 R3 [J]", -1, params.getColumnPos(18));
+        assertEquals("19 key auto 8 R3 adjust", -1, params.mTopRowAdjustment);
+        assertEquals("19 key auto 8 R3 default", WIDTH * 5, params.getDefaultKeyCoordX());
+    }
+}
diff --git a/tests/src/com/android/inputmethod/keyboard/MoreKeysKeyboardBuilderFixedOrderTests.java b/tests/src/com/android/inputmethod/keyboard/MoreKeysKeyboardBuilderFixedOrderTests.java
index 6d9c3fd..7e51d95 100644
--- a/tests/src/com/android/inputmethod/keyboard/MoreKeysKeyboardBuilderFixedOrderTests.java
+++ b/tests/src/com/android/inputmethod/keyboard/MoreKeysKeyboardBuilderFixedOrderTests.java
@@ -47,7 +47,8 @@
             final int coordXInParent) {
         final MoreKeysKeyboardParams params = new MoreKeysKeyboardParams();
         params.setParameters(numKeys, columnNum, WIDTH, HEIGHT, coordXInParent, KEYBOARD_WIDTH,
-                true /* isFixedOrderColumn */, 0 /* dividerWidth */);
+                true /* isMoreKeysFixedColumn */, true /* isMoreKeysFixedOrder */,
+                0 /* dividerWidth */);
         return params;
     }
 
diff --git a/tests/src/com/android/inputmethod/keyboard/MoreKeysKeyboardBuilderTests.java b/tests/src/com/android/inputmethod/keyboard/MoreKeysKeyboardBuilderMaxOrderTests.java
similarity index 99%
rename from tests/src/com/android/inputmethod/keyboard/MoreKeysKeyboardBuilderTests.java
rename to tests/src/com/android/inputmethod/keyboard/MoreKeysKeyboardBuilderMaxOrderTests.java
index b213721..806790e 100644
--- a/tests/src/com/android/inputmethod/keyboard/MoreKeysKeyboardBuilderTests.java
+++ b/tests/src/com/android/inputmethod/keyboard/MoreKeysKeyboardBuilderMaxOrderTests.java
@@ -22,7 +22,7 @@
 import com.android.inputmethod.keyboard.MoreKeysKeyboard.MoreKeysKeyboardParams;
 
 @MediumTest
-public class MoreKeysKeyboardBuilderTests extends AndroidTestCase {
+public class MoreKeysKeyboardBuilderMaxOrderTests extends AndroidTestCase {
     private static final int WIDTH = 10;
     private static final int HEIGHT = 10;
 
@@ -47,7 +47,8 @@
             final int coordXInParent) {
         final MoreKeysKeyboardParams params = new MoreKeysKeyboardParams();
         params.setParameters(numKeys, maxColumns, WIDTH, HEIGHT, coordXInParent, KEYBOARD_WIDTH,
-                false /* isFixedOrderColumn */, 0 /* dividerWidth */);
+                false /* isMoreKeysFixedColumn */, false /* isMoreKeysFixedOrder */,
+                0 /* dividerWidth */);
         return params;
     }