diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2012-03-01 13:09:39 +0900 |
|---|---|---|
| committer | Tadashi G. Takaoka <takaoka@google.com> | 2012-03-01 16:07:02 +0900 |
| commit | 42fd1d2d72c097b2227d4b22f0f824dbb34a4d0c (patch) | |
| tree | 0be27075112f5a95f722b5b5bdcab0b9de6aa5e7 /tests/src | |
| parent | 36aa8e39b55497a229991227cddca4ba2f472b1f (diff) | |
| download | latinime-42fd1d2d72c097b2227d4b22f0f824dbb34a4d0c.tar.gz latinime-42fd1d2d72c097b2227d4b22f0f824dbb34a4d0c.tar.xz latinime-42fd1d2d72c097b2227d4b22f0f824dbb34a4d0c.zip | |
Refactor more keys spec handling
Change-Id: Ibd95eff0725724ea35ad58e1d1ec7ec3d02a6e90
Diffstat (limited to 'tests/src')
| -rw-r--r-- | tests/src/com/android/inputmethod/keyboard/MoreKeysKeyboardBuilderFixedOrderTests.java | 8 | ||||
| -rw-r--r-- | tests/src/com/android/inputmethod/keyboard/MoreKeysKeyboardBuilderTests.java | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/tests/src/com/android/inputmethod/keyboard/MoreKeysKeyboardBuilderFixedOrderTests.java b/tests/src/com/android/inputmethod/keyboard/MoreKeysKeyboardBuilderFixedOrderTests.java index c0b3445e0..afd3df40b 100644 --- a/tests/src/com/android/inputmethod/keyboard/MoreKeysKeyboardBuilderFixedOrderTests.java +++ b/tests/src/com/android/inputmethod/keyboard/MoreKeysKeyboardBuilderFixedOrderTests.java @@ -41,10 +41,12 @@ public class MoreKeysKeyboardBuilderFixedOrderTests extends AndroidTestCase { super.setUp(); } - private static MoreKeysKeyboardParams createParams(int numKeys, int fixColumns, + private static MoreKeysKeyboardParams createParams(int numKeys, int columnNum, int coordXInParnet) { - return new MoreKeysKeyboardParams(numKeys, fixColumns | Key.MORE_KEYS_FIXED_COLUMN_ORDER, - WIDTH, HEIGHT, coordXInParnet, KEYBOARD_WIDTH); + final MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(); + params.setParameters(numKeys, columnNum, WIDTH, HEIGHT, coordXInParnet, KEYBOARD_WIDTH, + /* isFixedOrderColumn */true); + return params; } public void testLayoutError() { diff --git a/tests/src/com/android/inputmethod/keyboard/MoreKeysKeyboardBuilderTests.java b/tests/src/com/android/inputmethod/keyboard/MoreKeysKeyboardBuilderTests.java index 90bbf7eff..456247bae 100644 --- a/tests/src/com/android/inputmethod/keyboard/MoreKeysKeyboardBuilderTests.java +++ b/tests/src/com/android/inputmethod/keyboard/MoreKeysKeyboardBuilderTests.java @@ -43,8 +43,10 @@ public class MoreKeysKeyboardBuilderTests extends AndroidTestCase { private static MoreKeysKeyboardParams createParams(int numKeys, int maxColumns, int coordXInParnet) { - return new MoreKeysKeyboardParams(numKeys, maxColumns, WIDTH, HEIGHT, coordXInParnet, - KEYBOARD_WIDTH); + final MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(); + params.setParameters(numKeys, maxColumns, WIDTH, HEIGHT, coordXInParnet, KEYBOARD_WIDTH, + /* isFixedOrderColumn */false); + return params; } public void testLayoutError() { |