diff --git a/java/proguard.flags b/java/proguard.flags index caf1ea183..5ce0c273c 100644 --- a/java/proguard.flags +++ b/java/proguard.flags @@ -35,6 +35,6 @@ *; } --keep class com.android.inputmethod.keyboard.MiniKeyboard$Builder$MiniKeyboardParams { +-keep class com.android.inputmethod.keyboard.MoreKeysKeyboard$Builder$MoreKeysKeyboardParams { (...); } diff --git a/java/res/anim/mini_keyboard_fadein.xml b/java/res/anim/more_keys_keyboard_fadein.xml similarity index 91% rename from java/res/anim/mini_keyboard_fadein.xml rename to java/res/anim/more_keys_keyboard_fadein.xml index f80e8b8de..c781f36ad 100644 --- a/java/res/anim/mini_keyboard_fadein.xml +++ b/java/res/anim/more_keys_keyboard_fadein.xml @@ -25,5 +25,5 @@ + android:duration="@integer/config_more_keys_keyboard_fadein_anim_time" /> diff --git a/java/res/anim/mini_keyboard_fadeout.xml b/java/res/anim/more_keys_keyboard_fadeout.xml similarity index 91% rename from java/res/anim/mini_keyboard_fadeout.xml rename to java/res/anim/more_keys_keyboard_fadeout.xml index 535b100ae..32fae6bd8 100644 --- a/java/res/anim/mini_keyboard_fadeout.xml +++ b/java/res/anim/more_keys_keyboard_fadeout.xml @@ -25,5 +25,5 @@ + android:duration="@integer/config_more_keys_keyboard_fadeout_anim_time" /> diff --git a/java/res/layout/mini_keyboard.xml b/java/res/layout/more_keys_keyboard.xml similarity index 87% rename from java/res/layout/mini_keyboard.xml rename to java/res/layout/more_keys_keyboard.xml index 6964ec5d6..89161c6b4 100644 --- a/java/res/layout/mini_keyboard.xml +++ b/java/res/layout/more_keys_keyboard.xml @@ -22,11 +22,11 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal" - style="?attr/miniKeyboardPanelStyle" + style="?attr/moreKeysKeyboardPanelStyle" > - "\u060c,\u061b,\u061f,!,:,-,/,\',\",\u0640\u0640\u0640|\u0640,\u064e,\u0650,\u064b,\u064d,\u0670,\u0656,\u0655,\u0654,\u0653,\u0652,\u0651,\u064c,\u064f" - 9 + 9 \u064b "١" "٢" diff --git a/java/res/values-land/dimens.xml b/java/res/values-land/dimens.xml index dcbfe463e..f9cce839a 100644 --- a/java/res/values-land/dimens.xml +++ b/java/res/values-land/dimens.xml @@ -66,7 +66,7 @@ 72dip - 0.336in + 0.336in - -0.280in + -0.280in diff --git a/java/res/values-sw600dp/config.xml b/java/res/values-sw600dp/config.xml index 40c674190..ecc5b7136 100644 --- a/java/res/values-sw600dp/config.xml +++ b/java/res/values-sw600dp/config.xml @@ -39,6 +39,7 @@ Configuration for LatinKeyboardView --> false - - true + + true diff --git a/java/res/values-sw600dp/dimens.xml b/java/res/values-sw600dp/dimens.xml index e393be579..e04609f2a 100644 --- a/java/res/values-sw600dp/dimens.xml +++ b/java/res/values-sw600dp/dimens.xml @@ -40,12 +40,12 @@ 0.0%p - 6dip + 6dip - 15.6mm + 15.6mm - -13.0mm + -13.0mm 6dip diff --git a/java/res/values-sw768dp/config.xml b/java/res/values-sw768dp/config.xml index 98d722aba..c1f9179ee 100644 --- a/java/res/values-sw768dp/config.xml +++ b/java/res/values-sw768dp/config.xml @@ -37,8 +37,9 @@ Configuration for LatinKeyboardView --> false - - true + + true - 15.6mm + 15.6mm - -13.0mm + -13.0mm 6dip diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml index 410a94208..86e3fe3cb 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -25,11 +25,11 @@ - - - - - + + + + + @@ -152,8 +152,8 @@ - - + + @@ -232,7 +232,10 @@ been replaced, those remaining entries are appended at the end of moreKeys. --> - + + + + diff --git a/java/res/values/config.xml b/java/res/values/config.xml index c3f8edf8a..cb13ba30b 100644 --- a/java/res/values/config.xml +++ b/java/res/values/config.xml @@ -44,8 +44,8 @@ 100 50 50 - 0 - 100 + 0 + 100 32 16 1100 @@ -69,10 +69,12 @@ 1200 - @integer/config_long_press_key_timeout + + @integer/config_long_press_key_timeout 700 - - false + + false @@ -88,9 +90,11 @@ will be subject to auto-correction. --> 0 - + 0.11 - + 0.03 - 0.396in + 0.396in - -0.330in + -0.330in 0.0in diff --git a/java/res/values/donottranslate-more-keys.xml b/java/res/values/donottranslate-more-keys.xml index d78e41fb1..57a6d6bda 100644 --- a/java/res/values/donottranslate-more-keys.xml +++ b/java/res/values/donottranslate-more-keys.xml @@ -56,7 +56,7 @@ ¢,$,€,£,¥,₱ ":-)|:-) ,:-(|:-( ,;-)|;-) ,:-P|:-P ,=-O|=-O ,:-*|:-* ,:O|:O ,B-)|B-) ,:-$|:-$ ,:-!|:-! ,:-[|:-[ ,O:-)|O:-) ,:-\\\\|:-\\\\ ,:\'(|:\'( ,:-D|:-D " "\\,,\?,!,:,-,\',\",(,),/,;,+,&,\@" - 7 + 7 ".com" diff --git a/java/res/values/styles.xml b/java/res/values/styles.xml index f69078288..b9e8b26a3 100644 --- a/java/res/values/styles.xml +++ b/java/res/values/styles.xml @@ -23,7 +23,7 @@ @dimen/keyboardHeight @fraction/maxKeyboardHeight @fraction/minKeyboardHeight - @xml/kbd_mini_keyboard_template + @xml/kbd_more_keys_keyboard_template @fraction/keyboard_top_padding @fraction/keyboard_bottom_padding @fraction/keyboard_horizontal_edges_padding @@ -60,7 +60,7 @@ @dimen/key_preview_height @fraction/key_preview_text_ratio @integer/config_key_preview_linger_timeout - @layout/mini_keyboard + @layout/more_keys_keyboard @dimen/keyboard_vertical_correction #BB000000 2.75 @@ -76,7 +76,7 @@ @integer/config_long_press_shift_key_timeout @integer/config_long_press_space_key_timeout @integer/config_ignore_special_key_timeout - @bool/config_show_mini_keyboard_at_touched_point + @bool/config_show_more_keys_keyboard_at_touched_point - @@ -322,7 +322,7 @@ #80000000 - - diff --git a/java/res/values/themes-basic-highcontrast.xml b/java/res/values/themes-basic-highcontrast.xml index 0062b2837..19df42ce1 100644 --- a/java/res/values/themes-basic-highcontrast.xml +++ b/java/res/values/themes-basic-highcontrast.xml @@ -19,9 +19,9 @@ @style/Keyboard.HighContrast @style/KeyboardView.HighContrast @style/LatinKeyboardView.HighContrast - @style/MiniKeyboard - @style/MiniKeyboardView - @style/MiniKeyboardPanelStyle + @style/MoreKeysKeyboard + @style/MoreKeysKeyboardView + @style/MoreKeysKeyboardPanelStyle @style/SuggestionsStripBackgroundStyle @style/SuggestionsViewStyle @style/MoreSuggestionsViewStyle diff --git a/java/res/values/themes-basic.xml b/java/res/values/themes-basic.xml index 0786e08fc..5d477206d 100644 --- a/java/res/values/themes-basic.xml +++ b/java/res/values/themes-basic.xml @@ -19,9 +19,9 @@ @style/Keyboard @style/KeyboardView @style/LatinKeyboardView - @style/MiniKeyboard - @style/MiniKeyboardView - @style/MiniKeyboardPanelStyle + @style/MoreKeysKeyboard + @style/MoreKeysKeyboardView + @style/MoreKeysKeyboardPanelStyle @style/SuggestionsStripBackgroundStyle @style/SuggestionsViewStyle @style/MoreSuggestionsViewStyle diff --git a/java/res/values/themes-gingerbread.xml b/java/res/values/themes-gingerbread.xml index 44338d821..a13979818 100644 --- a/java/res/values/themes-gingerbread.xml +++ b/java/res/values/themes-gingerbread.xml @@ -19,9 +19,9 @@ @style/Keyboard.Gingerbread @style/KeyboardView.Gingerbread @style/LatinKeyboardView.Gingerbread - @style/MiniKeyboard.Gingerbread - @style/MiniKeyboardView.Gingerbread - @style/MiniKeyboardPanelStyle + @style/MoreKeysKeyboard.Gingerbread + @style/MoreKeysKeyboardView.Gingerbread + @style/MoreKeysKeyboardPanelStyle @style/SuggestionsStripBackgroundStyle @style/SuggestionsViewStyle @style/MoreSuggestionsViewStyle diff --git a/java/res/values/themes-ics.xml b/java/res/values/themes-ics.xml index dbc8f32e3..e6fd4f451 100644 --- a/java/res/values/themes-ics.xml +++ b/java/res/values/themes-ics.xml @@ -19,9 +19,9 @@ @style/Keyboard.IceCreamSandwich @style/KeyboardView.IceCreamSandwich @style/LatinKeyboardView.IceCreamSandwich - @style/MiniKeyboard.IceCreamSandwich - @style/MiniKeyboardView.IceCreamSandwich - @style/MiniKeyboardPanelStyle.IceCreamSandwich + @style/MoreKeysKeyboard.IceCreamSandwich + @style/MoreKeysKeyboardView.IceCreamSandwich + @style/MoreKeysKeyboardPanelStyle.IceCreamSandwich @style/SuggestionsStripBackgroundStyle.IceCreamSandwich @style/SuggestionsViewStyle.IceCreamSandwich @style/MoreSuggestionsViewStyle.IceCreamSandwich diff --git a/java/res/values/themes-stone-bold.xml b/java/res/values/themes-stone-bold.xml index 60f130d59..47de99e47 100644 --- a/java/res/values/themes-stone-bold.xml +++ b/java/res/values/themes-stone-bold.xml @@ -19,9 +19,9 @@ @style/Keyboard.Stone.Bold @style/KeyboardView.Stone.Bold @style/LatinKeyboardView.Stone.Bold - @style/MiniKeyboard.Stone - @style/MiniKeyboardView.Stone - @style/MiniKeyboardPanelStyle + @style/MoreKeysKeyboard.Stone + @style/MoreKeysKeyboardView.Stone + @style/MoreKeysKeyboardPanelStyle @style/SuggestionsStripBackgroundStyle @style/SuggestionsViewStyle @style/MoreSuggestionsViewStyle diff --git a/java/res/values/themes-stone.xml b/java/res/values/themes-stone.xml index 9aaca3a6c..a0b39e3e6 100644 --- a/java/res/values/themes-stone.xml +++ b/java/res/values/themes-stone.xml @@ -19,9 +19,9 @@ @style/Keyboard.Stone @style/KeyboardView.Stone @style/LatinKeyboardView.Stone - @style/MiniKeyboard.Stone - @style/MiniKeyboardView.Stone - @style/MiniKeyboardPanelStyle + @style/MoreKeysKeyboard.Stone + @style/MoreKeysKeyboardView.Stone + @style/MoreKeysKeyboardPanelStyle @style/SuggestionsStripBackgroundStyle @style/SuggestionsViewStyle @style/MoreSuggestionsViewStyle diff --git a/java/res/xml-sw600dp-land/kbd_mini_keyboard_template.xml b/java/res/xml-sw600dp-land/kbd_more_keys_keyboard_template.xml similarity index 95% rename from java/res/xml-sw600dp-land/kbd_mini_keyboard_template.xml rename to java/res/xml-sw600dp-land/kbd_more_keys_keyboard_template.xml index 8272e02f0..4d8b446a2 100644 --- a/java/res/xml-sw600dp-land/kbd_mini_keyboard_template.xml +++ b/java/res/xml-sw600dp-land/kbd_more_keys_keyboard_template.xml @@ -21,6 +21,6 @@ diff --git a/java/res/xml-sw600dp/kbd_mini_keyboard_template.xml b/java/res/xml-sw600dp/kbd_more_keys_keyboard_template.xml similarity index 95% rename from java/res/xml-sw600dp/kbd_mini_keyboard_template.xml rename to java/res/xml-sw600dp/kbd_more_keys_keyboard_template.xml index 0d5795f6a..d90a5884e 100644 --- a/java/res/xml-sw600dp/kbd_mini_keyboard_template.xml +++ b/java/res/xml-sw600dp/kbd_more_keys_keyboard_template.xml @@ -21,6 +21,6 @@ diff --git a/java/res/xml-sw768dp-land/kbd_mini_keyboard_template.xml b/java/res/xml-sw768dp-land/kbd_more_keys_keyboard_template.xml similarity index 95% rename from java/res/xml-sw768dp-land/kbd_mini_keyboard_template.xml rename to java/res/xml-sw768dp-land/kbd_more_keys_keyboard_template.xml index 85e864a6c..f593fa944 100644 --- a/java/res/xml-sw768dp-land/kbd_mini_keyboard_template.xml +++ b/java/res/xml-sw768dp-land/kbd_more_keys_keyboard_template.xml @@ -21,6 +21,6 @@ diff --git a/java/res/xml-sw768dp/kbd_mini_keyboard_template.xml b/java/res/xml-sw768dp/kbd_more_keys_keyboard_template.xml similarity index 95% rename from java/res/xml-sw768dp/kbd_mini_keyboard_template.xml rename to java/res/xml-sw768dp/kbd_more_keys_keyboard_template.xml index 409c60556..f89a0a673 100644 --- a/java/res/xml-sw768dp/kbd_mini_keyboard_template.xml +++ b/java/res/xml-sw768dp/kbd_more_keys_keyboard_template.xml @@ -21,6 +21,6 @@ diff --git a/java/res/xml/kbd_mini_keyboard_template.xml b/java/res/xml/kbd_more_keys_keyboard_template.xml similarity index 95% rename from java/res/xml/kbd_mini_keyboard_template.xml rename to java/res/xml/kbd_more_keys_keyboard_template.xml index ad6cf51fe..8e977c5ad 100644 --- a/java/res/xml/kbd_mini_keyboard_template.xml +++ b/java/res/xml/kbd_more_keys_keyboard_template.xml @@ -21,6 +21,6 @@ diff --git a/java/res/xml/key_styles_common.xml b/java/res/xml/key_styles_common.xml index ab9bc4672..177a62c58 100644 --- a/java/res/xml/key_styles_common.xml +++ b/java/res/xml/key_styles_common.xml @@ -278,6 +278,6 @@ latin:keyHintLabel="@string/keyhintlabel_for_punctuation" latin:keyLabelFlags="hasPopupHint|preserveCase" latin:moreKeys="@string/more_keys_for_punctuation" - latin:maxMoreKeysColumn="@integer/mini_keyboard_column_for_punctuation" + latin:maxMoreKeysColumn="@integer/more_keys_keyboard_column_for_punctuation" latin:backgroundType="functional" /> diff --git a/java/src/com/android/inputmethod/keyboard/Key.java b/java/src/com/android/inputmethod/keyboard/Key.java index 6eaa606db..5656c38b4 100644 --- a/java/src/com/android/inputmethod/keyboard/Key.java +++ b/java/src/com/android/inputmethod/keyboard/Key.java @@ -245,7 +245,7 @@ public class Key { mActionFlags = actionFlags; mMoreKeys = moreKeys; mMaxMoreKeysColumn = style.getInt(keyAttr, - R.styleable.Keyboard_Key_maxMoreKeysColumn, params.mMaxMiniKeyboardColumn); + R.styleable.Keyboard_Key_maxMoreKeysColumn, params.mMaxMoreKeysKeyboardColumn); mLabel = adjustCaseOfStringForKeyboardId(style.getString(keyAttr, R.styleable.Keyboard_Key_keyLabel), preserveCase, params.mId); diff --git a/java/src/com/android/inputmethod/keyboard/Keyboard.java b/java/src/com/android/inputmethod/keyboard/Keyboard.java index 10e0a5b01..cb6a54569 100644 --- a/java/src/com/android/inputmethod/keyboard/Keyboard.java +++ b/java/src/com/android/inputmethod/keyboard/Keyboard.java @@ -121,8 +121,8 @@ public class Keyboard { /** More keys keyboard template */ public final int mMoreKeysTemplate; - /** Maximum column for mini keyboard */ - public final int mMaxMiniKeyboardColumn; + /** Maximum column for more keys keyboard */ + public final int mMaxMoreKeysKeyboardColumn; /** List of keys and icons in this keyboard */ public final Set mKeys; @@ -143,7 +143,7 @@ public class Keyboard { mMostCommonKeyHeight = params.mMostCommonKeyHeight; mMostCommonKeyWidth = params.mMostCommonKeyWidth; mMoreKeysTemplate = params.mMoreKeysTemplate; - mMaxMiniKeyboardColumn = params.mMaxMiniKeyboardColumn; + mMaxMoreKeysKeyboardColumn = params.mMaxMoreKeysKeyboardColumn; mTopPadding = params.mTopPadding; mVerticalGap = params.mVerticalGap; @@ -226,7 +226,7 @@ public class Keyboard { public int mVerticalGap; public int mMoreKeysTemplate; - public int mMaxMiniKeyboardColumn; + public int mMaxMoreKeysKeyboardColumn; public int GRID_WIDTH; public int GRID_HEIGHT; @@ -770,7 +770,7 @@ public class Keyboard { params.mMoreKeysTemplate = keyboardAttr.getResourceId( R.styleable.Keyboard_moreKeysTemplate, 0); - params.mMaxMiniKeyboardColumn = keyAttr.getInt( + params.mMaxMoreKeysKeyboardColumn = keyAttr.getInt( R.styleable.Keyboard_Key_maxMoreKeysColumn, 5); params.mIconsSet.loadIcons(keyboardAttr); diff --git a/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java b/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java index 870c7cb25..88a41579d 100644 --- a/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java +++ b/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java @@ -92,13 +92,13 @@ public class LatinKeyboardView extends KeyboardView implements PointerTracker.Ke private final Drawable mAutoCorrectionSpacebarLedIcon; private static final int SPACE_LED_LENGTH_PERCENT = 80; - // Mini keyboard + // More keys keyboard private PopupWindow mMoreKeysWindow; private MoreKeysPanel mMoreKeysPanel; private int mMoreKeysPanelPointerTrackerId; private final WeakHashMap mMoreKeysPanelCache = new WeakHashMap(); - private final boolean mConfigShowMiniKeyboardAtTouchedPoint; + private final boolean mConfigShowMoreKeysKeyboardAtTouchedPoint; private final PointerTrackerParams mPointerTrackerParams; private final boolean mIsSpacebarTriggeringPopupByLongPress; @@ -137,7 +137,7 @@ public class LatinKeyboardView extends KeyboardView implements PointerTracker.Ke break; case MSG_LONGPRESS_KEY: if (tracker != null) { - keyboardView.openMiniKeyboardIfRequired(tracker.getKey(), tracker); + keyboardView.openMoreKeysKeyboardIfRequired(tracker.getKey(), tracker); } else { KeyboardSwitcher.getInstance().onLongPressTimeout(msg.arg1); } @@ -338,8 +338,8 @@ public class LatinKeyboardView extends KeyboardView implements PointerTracker.Ke R.styleable.LatinKeyboardView_keyHysteresisDistance, 0); mKeyDetector = new KeyDetector(keyHysteresisDistance); mKeyTimerHandler = new KeyTimerHandler(this, keyTimerParams); - mConfigShowMiniKeyboardAtTouchedPoint = a.getBoolean( - R.styleable.LatinKeyboardView_showMiniKeyboardAtTouchedPoint, false); + mConfigShowMoreKeysKeyboardAtTouchedPoint = a.getBoolean( + R.styleable.LatinKeyboardView_showMoreKeysKeyboardAtTouchedPoint, false); a.recycle(); PointerTracker.setParameters(mPointerTrackerParams); @@ -435,7 +435,7 @@ public class LatinKeyboardView extends KeyboardView implements PointerTracker.Ke super.cancelAllMessages(); } - private boolean openMiniKeyboardIfRequired(Key parentKey, PointerTracker tracker) { + private boolean openMoreKeysKeyboardIfRequired(Key parentKey, PointerTracker tracker) { // Check if we have a popup layout specified first. if (mMoreKeysLayout == 0) { return false; @@ -458,19 +458,19 @@ public class LatinKeyboardView extends KeyboardView implements PointerTracker.Ke if (container == null) throw new NullPointerException(); - final MiniKeyboardView miniKeyboardView = - (MiniKeyboardView)container.findViewById(R.id.mini_keyboard_view); + final MoreKeysKeyboardView moreKeysKeyboardView = + (MoreKeysKeyboardView)container.findViewById(R.id.more_keys_keyboard_view); final Keyboard parentKeyboard = getKeyboard(); - final Keyboard miniKeyboard = new MiniKeyboard.Builder( + final Keyboard moreKeysKeyboard = new MoreKeysKeyboard.Builder( this, parentKeyboard.mMoreKeysTemplate, parentKey, parentKeyboard).build(); - miniKeyboardView.setKeyboard(miniKeyboard); + moreKeysKeyboardView.setKeyboard(moreKeysKeyboard); container.measure(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); - return miniKeyboardView; + return moreKeysKeyboardView; } /** - * Called when a key is long pressed. By default this will open mini keyboard associated + * Called when a key is long pressed. By default this will open more keys keyboard associated * with this key. * @param parentKey the key that was long pressed * @param tracker the pointer tracker which pressed the parent key @@ -524,13 +524,13 @@ public class LatinKeyboardView extends KeyboardView implements PointerTracker.Ke if (mMoreKeysWindow == null) { mMoreKeysWindow = new PopupWindow(getContext()); mMoreKeysWindow.setBackgroundDrawable(null); - mMoreKeysWindow.setAnimationStyle(R.style.MiniKeyboardAnimation); + mMoreKeysWindow.setAnimationStyle(R.style.MoreKeysKeyboardAnimation); } mMoreKeysPanel = moreKeysPanel; mMoreKeysPanelPointerTrackerId = tracker.mPointerId; final Keyboard keyboard = getKeyboard(); - final int pointX = (mConfigShowMiniKeyboardAtTouchedPoint) ? tracker.getLastX() + final int pointX = (mConfigShowMoreKeysKeyboardAtTouchedPoint) ? tracker.getLastX() : parentKey.mX + parentKey.mWidth / 2; final int pointY = parentKey.mY - keyboard.mVerticalGap; moreKeysPanel.showMoreKeysPanel( diff --git a/java/src/com/android/inputmethod/keyboard/MiniKeyboard.java b/java/src/com/android/inputmethod/keyboard/MoreKeysKeyboard.java similarity index 83% rename from java/src/com/android/inputmethod/keyboard/MiniKeyboard.java rename to java/src/com/android/inputmethod/keyboard/MoreKeysKeyboard.java index 4648da1c1..83155f719 100644 --- a/java/src/com/android/inputmethod/keyboard/MiniKeyboard.java +++ b/java/src/com/android/inputmethod/keyboard/MoreKeysKeyboard.java @@ -21,10 +21,10 @@ import android.graphics.Paint; import com.android.inputmethod.keyboard.internal.KeySpecParser; import com.android.inputmethod.latin.R; -public class MiniKeyboard extends Keyboard { +public class MoreKeysKeyboard extends Keyboard { private final int mDefaultKeyCoordX; - private MiniKeyboard(Builder.MiniKeyboardParams params) { + private MoreKeysKeyboard(Builder.MoreKeysKeyboardParams params) { super(params); mDefaultKeyCoordX = params.getDefaultKeyCoordX() + params.mDefaultKeyWidth / 2; } @@ -33,21 +33,21 @@ public class MiniKeyboard extends Keyboard { return mDefaultKeyCoordX; } - public static class Builder extends Keyboard.Builder { + public static class Builder extends Keyboard.Builder { private final String[] mMoreKeys; - public static class MiniKeyboardParams extends Keyboard.Params { + public static class MoreKeysKeyboardParams extends Keyboard.Params { /* package */int mTopRowAdjustment; public int mNumRows; public int mNumColumns; public int mLeftKeys; public int mRightKeys; // includes default key. - public MiniKeyboardParams() { + public MoreKeysKeyboardParams() { super(); } - /* package for test */MiniKeyboardParams(int numKeys, int maxColumns, int keyWidth, + /* package for test */MoreKeysKeyboardParams(int numKeys, int maxColumns, int keyWidth, int rowHeight, int coordXInParent, int parentKeyboardWidth) { super(); setParameters(numKeys, maxColumns, keyWidth, rowHeight, coordXInParent, @@ -55,21 +55,21 @@ public class MiniKeyboard extends Keyboard { } /** - * Set keyboard parameters of mini keyboard. + * Set keyboard parameters of more keys keyboard. * - * @param numKeys number of keys in this mini keyboard. - * @param maxColumns number of maximum columns of this mini keyboard. - * @param keyWidth mini keyboard key width in pixel, including horizontal gap. - * @param rowHeight mini keyboard row height in pixel, including vertical gap. - * @param coordXInParent coordinate x of the popup key in parent keyboard. + * @param numKeys number of keys in this more keys keyboard. + * @param maxColumns number of maximum 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. */ public void setParameters(int numKeys, int maxColumns, int keyWidth, int rowHeight, int coordXInParent, int parentKeyboardWidth) { if (parentKeyboardWidth / keyWidth < maxColumns) { throw new IllegalArgumentException( - "Keyboard is too small to hold mini keyboard: " + parentKeyboardWidth - + " " + keyWidth + " " + maxColumns); + "Keyboard is too small to hold more keys keyboard: " + + parentKeyboardWidth + " " + keyWidth + " " + maxColumns); } mDefaultKeyWidth = keyWidth; mDefaultRowHeight = rowHeight; @@ -95,14 +95,14 @@ public class MiniKeyboard extends Keyboard { leftKeys = numLeftKeys; rightKeys = numRightKeys; } - // Shift right if the left edge of mini keyboard is on the edge of parent keyboard - // unless the parent key is on the left edge. + // Shift right if the left edge of more keys keyboard is on the edge of parent + // keyboard unless the parent key is on the left edge. if (leftKeys * keyWidth >= coordXInParent && leftKeys > 0) { leftKeys--; rightKeys++; } - // Shift left if the right edge of mini keyboard is on the edge of parent keyboard - // unless the parent key is on the right edge. + // Shift left if the right edge of more keys keyboard is on the edge of parent + // keyboard unless the parent key is on the right edge. if (rightKeys * keyWidth + coordXInParent >= parentKeyboardWidth && rightKeys > 1) { leftKeys++; rightKeys--; @@ -204,10 +204,10 @@ public class MiniKeyboard extends Keyboard { } public Builder(KeyboardView view, int xmlId, Key parentKey, Keyboard parentKeyboard) { - super(view.getContext(), new MiniKeyboardParams()); + super(view.getContext(), new MoreKeysKeyboardParams()); load(xmlId, parentKeyboard.mId); - // TODO: Mini keyboard's vertical gap is currently calculated heuristically. + // TODO: More keys keyboard's vertical gap is currently calculated heuristically. // Should revise the algorithm. mParams.mVerticalGap = parentKeyboard.mVerticalGap / 2; mMoreKeys = parentKey.mMoreKeys; @@ -215,8 +215,9 @@ public class MiniKeyboard extends Keyboard { final int previewWidth = view.mKeyPreviewDrawParams.mPreviewBackgroundWidth; final int previewHeight = view.mKeyPreviewDrawParams.mPreviewBackgroundHeight; final int width, height; - // Use pre-computed width and height if these values are available and mini keyboard - // has only one key to mitigate visual flicker between key preview and mini keyboard. + // Use pre-computed width and height if these values are available and more keys + // keyboard has only one key to mitigate visual flicker between key preview and more + // keys keyboard. if (view.isKeyPreviewPopupEnabled() && mMoreKeys.length == 1 && previewWidth > 0 && previewHeight > 0) { width = previewWidth; @@ -231,7 +232,7 @@ public class MiniKeyboard extends Keyboard { private static int getMaxKeyWidth(KeyboardView view, String[] moreKeys, int minKeyWidth) { final int padding = (int) view.getContext().getResources() - .getDimension(R.dimen.mini_keyboard_key_horizontal_padding); + .getDimension(R.dimen.more_keys_keyboard_key_horizontal_padding); Paint paint = null; int maxWidth = minKeyWidth; for (String moreKeySpec : moreKeys) { @@ -252,8 +253,8 @@ public class MiniKeyboard extends Keyboard { } @Override - public MiniKeyboard build() { - final MiniKeyboardParams params = mParams; + public MoreKeysKeyboard build() { + final MoreKeysKeyboardParams params = mParams; for (int n = 0; n < mMoreKeys.length; n++) { final String moreKeySpec = mMoreKeys[n]; final int row = n / params.mNumColumns; @@ -262,7 +263,7 @@ public class MiniKeyboard extends Keyboard { params.markAsEdgeKey(key, row); params.onAddKey(key); } - return new MiniKeyboard(params); + return new MoreKeysKeyboard(params); } } } diff --git a/java/src/com/android/inputmethod/keyboard/MiniKeyboardView.java b/java/src/com/android/inputmethod/keyboard/MoreKeysKeyboardView.java similarity index 83% rename from java/src/com/android/inputmethod/keyboard/MiniKeyboardView.java rename to java/src/com/android/inputmethod/keyboard/MoreKeysKeyboardView.java index 72d5b6889..b030dd95a 100644 --- a/java/src/com/android/inputmethod/keyboard/MiniKeyboardView.java +++ b/java/src/com/android/inputmethod/keyboard/MoreKeysKeyboardView.java @@ -28,10 +28,10 @@ import com.android.inputmethod.keyboard.PointerTracker.TimerProxy; import com.android.inputmethod.latin.R; /** - * A view that renders a virtual {@link MiniKeyboard}. It handles rendering of keys and detecting - * key presses and touch movements. + * A view that renders a virtual {@link MoreKeysKeyboard}. It handles rendering of keys and + * detecting key presses and touch movements. */ -public class MiniKeyboardView extends KeyboardView implements MoreKeysPanel { +public class MoreKeysKeyboardView extends KeyboardView implements MoreKeysPanel { private final int[] mCoordinates = new int[2]; private final KeyDetector mKeyDetector; @@ -43,7 +43,7 @@ public class MiniKeyboardView extends KeyboardView implements MoreKeysPanel { private static final TimerProxy EMPTY_TIMER_PROXY = new TimerProxy.Adapter(); - private final KeyboardActionListener mMiniKeyboardListener = + private final KeyboardActionListener mMoreKeysKeyboardListener = new KeyboardActionListener.Adapter() { @Override public void onCodeInput(int primaryCode, int[] keyCodes, int x, int y) { @@ -71,16 +71,16 @@ public class MiniKeyboardView extends KeyboardView implements MoreKeysPanel { } }; - public MiniKeyboardView(Context context, AttributeSet attrs) { - this(context, attrs, R.attr.miniKeyboardViewStyle); + public MoreKeysKeyboardView(Context context, AttributeSet attrs) { + this(context, attrs, R.attr.moreKeysKeyboardViewStyle); } - public MiniKeyboardView(Context context, AttributeSet attrs, int defStyle) { + public MoreKeysKeyboardView(Context context, AttributeSet attrs, int defStyle) { super(context, attrs, defStyle); final Resources res = context.getResources(); mKeyDetector = new MoreKeysDetector( - res.getDimension(R.dimen.mini_keyboard_slide_allowance)); + res.getDimension(R.dimen.more_keys_keyboard_slide_allowance)); setKeyPreviewPopupEnabled(false, 0); } @@ -110,7 +110,7 @@ public class MiniKeyboardView extends KeyboardView implements MoreKeysPanel { @Override public KeyboardActionListener getKeyboardActionListener() { - return mMiniKeyboardListener; + return mMoreKeysKeyboardListener; } @Override @@ -125,7 +125,7 @@ public class MiniKeyboardView extends KeyboardView implements MoreKeysPanel { @Override public void setKeyPreviewPopupEnabled(boolean previewEnabled, int delay) { - // Mini keyboard needs no pop-up key preview displayed, so we pass always false with a + // More keys keyboard needs no pop-up key preview displayed, so we pass always false with a // delay of 0. The delay does not matter actually since the popup is not shown anyway. super.setKeyPreviewPopupEnabled(false, 0); } @@ -136,13 +136,13 @@ public class MiniKeyboardView extends KeyboardView implements MoreKeysPanel { mController = controller; mListener = listener; final View container = (View)getParent(); - final MiniKeyboard miniKeyboard = (MiniKeyboard)getKeyboard(); + final MoreKeysKeyboard moreKeysKeyboard = (MoreKeysKeyboard)getKeyboard(); parentView.getLocationInWindow(mCoordinates); - final int miniKeyboardLeft = pointX - miniKeyboard.getDefaultCoordX() + final int moreKeysKeyboardLeft = pointX - moreKeysKeyboard.getDefaultCoordX() + parentView.getPaddingLeft(); - final int x = wrapUp(Math.max(0, Math.min(miniKeyboardLeft, - parentView.getWidth() - miniKeyboard.mOccupiedWidth)) + final int x = wrapUp(Math.max(0, Math.min(moreKeysKeyboardLeft, + parentView.getWidth() - moreKeysKeyboard.mOccupiedWidth)) - container.getPaddingLeft() + mCoordinates[0], container.getMeasuredWidth(), 0, parentView.getWidth()); final int y = pointY diff --git a/java/src/com/android/inputmethod/keyboard/ProximityInfo.java b/java/src/com/android/inputmethod/keyboard/ProximityInfo.java index 2d1a0083d..41e7ef435 100644 --- a/java/src/com/android/inputmethod/keyboard/ProximityInfo.java +++ b/java/src/com/android/inputmethod/keyboard/ProximityInfo.java @@ -59,7 +59,7 @@ public class ProximityInfo { mKeyHeight = keyHeight; mGridNeighbors = new Key[mGridSize][]; if (minWidth == 0 || height == 0) { - // No proximity required. Keyboard might be mini keyboard. + // No proximity required. Keyboard might be more keys keyboard. return; } computeNearestNeighbors(keyWidth, keys, touchPositionCorrection, additionalProximityChars); diff --git a/tests/src/com/android/inputmethod/keyboard/MiniKeyboardBuilderTests.java b/tests/src/com/android/inputmethod/keyboard/MoreKeysKeyboardBuilderTests.java similarity index 90% rename from tests/src/com/android/inputmethod/keyboard/MiniKeyboardBuilderTests.java rename to tests/src/com/android/inputmethod/keyboard/MoreKeysKeyboardBuilderTests.java index a143bbad5..b1d691039 100644 --- a/tests/src/com/android/inputmethod/keyboard/MiniKeyboardBuilderTests.java +++ b/tests/src/com/android/inputmethod/keyboard/MoreKeysKeyboardBuilderTests.java @@ -16,11 +16,11 @@ package com.android.inputmethod.keyboard; -import com.android.inputmethod.keyboard.MiniKeyboard.Builder.MiniKeyboardParams; - import android.test.AndroidTestCase; -public class MiniKeyboardBuilderTests extends AndroidTestCase { +import com.android.inputmethod.keyboard.MoreKeysKeyboard.Builder.MoreKeysKeyboardParams; + +public class MoreKeysKeyboardBuilderTests extends AndroidTestCase { private static final int MAX_COLUMNS = 5; private static final int WIDTH = 10; private static final int HEIGHT = 10; @@ -41,24 +41,24 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { } public void testLayoutError() { - MiniKeyboardParams params = null; + MoreKeysKeyboardParams params = null; try { - params = new MiniKeyboardParams(10, MAX_COLUMNS + 1, WIDTH, HEIGHT, WIDTH * 2, + params = new MoreKeysKeyboardParams(10, MAX_COLUMNS + 1, WIDTH, HEIGHT, WIDTH * 2, WIDTH * MAX_COLUMNS); fail("Should throw IllegalArgumentException"); } catch (IllegalArgumentException e) { - // Too small keyboard to hold mini keyboard. + // Too small keyboard to hold more keys keyboard. } - assertNull("Too small keyboard to hold mini keyboard", params); + assertNull("Too small keyboard to hold more keys keyboard", params); } - // Mini keyboard layout test. - // "[n]" represents n-th key position in mini keyboard. + // More keys keyboard layout test. + // "[n]" represents n-th key position in more keys keyboard. // "[1]" is the default key. // [1] public void testLayout1KeyM0() { - MiniKeyboardParams params = new MiniKeyboardParams(1, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(1, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_M0, KEYBOARD_WIDTH); assertEquals("1 key M0 columns", 1, params.mNumColumns); assertEquals("1 key M0 rows", 1, params.mNumRows); @@ -71,7 +71,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // |[1] public void testLayout1KeyL0() { - MiniKeyboardParams params = new MiniKeyboardParams(1, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(1, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_L0, KEYBOARD_WIDTH); assertEquals("1 key L0 columns", 1, params.mNumColumns); assertEquals("1 key L0 rows", 1, params.mNumRows); @@ -84,7 +84,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // |___ [1] public void testLayout1KeyL1() { - MiniKeyboardParams params = new MiniKeyboardParams(1, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(1, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_L1, KEYBOARD_WIDTH); assertEquals("1 key L1 columns", 1, params.mNumColumns); assertEquals("1 key L1 rows", 1, params.mNumRows); @@ -97,7 +97,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // |___ ___ [1] public void testLayout1KeyL2() { - MiniKeyboardParams params = new MiniKeyboardParams(1, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(1, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_L2, KEYBOARD_WIDTH); assertEquals("1 key L2 columns", 1, params.mNumColumns); assertEquals("1 key L2 rows", 1, params.mNumRows); @@ -110,7 +110,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // [1]| public void testLayout1KeyR0() { - MiniKeyboardParams params = new MiniKeyboardParams(1, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(1, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_R0, KEYBOARD_WIDTH); assertEquals("1 key R0 columns", 1, params.mNumColumns); assertEquals("1 key R0 rows", 1, params.mNumRows); @@ -123,7 +123,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // [1] ___| public void testLayout1KeyR1() { - MiniKeyboardParams params = new MiniKeyboardParams(1, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(1, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_R1, KEYBOARD_WIDTH); assertEquals("1 key R1 columns", 1, params.mNumColumns); assertEquals("1 key R1 rows", 1, params.mNumRows); @@ -136,7 +136,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // [1] ___ ___| public void testLayout1KeyR2() { - MiniKeyboardParams params = new MiniKeyboardParams(1, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(1, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_R2, KEYBOARD_WIDTH); assertEquals("1 key R2 columns", 1, params.mNumColumns); assertEquals("1 key R2 rows", 1, params.mNumRows); @@ -149,7 +149,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // [1] [2] public void testLayout2KeyM0() { - MiniKeyboardParams params = new MiniKeyboardParams(2, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(2, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_M0, KEYBOARD_WIDTH); assertEquals("2 key M0 columns", 2, params.mNumColumns); assertEquals("2 key M0 rows", 1, params.mNumRows); @@ -163,7 +163,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // |[1] [2] public void testLayout2KeyL0() { - MiniKeyboardParams params = new MiniKeyboardParams(2, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(2, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_L0, KEYBOARD_WIDTH); assertEquals("2 key L0 columns", 2, params.mNumColumns); assertEquals("2 key L0 rows", 1, params.mNumRows); @@ -177,7 +177,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // |___ [1] [2] public void testLayout2KeyL1() { - MiniKeyboardParams params = new MiniKeyboardParams(2, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(2, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_L1, KEYBOARD_WIDTH); assertEquals("2 key L1 columns", 2, params.mNumColumns); assertEquals("2 key L1 rows", 1, params.mNumRows); @@ -191,7 +191,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // |___ ___ [1] [2] public void testLayout2KeyL2() { - MiniKeyboardParams params = new MiniKeyboardParams(2, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(2, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_L2, KEYBOARD_WIDTH); assertEquals("2 key L2 columns", 2, params.mNumColumns); assertEquals("2 key L2 rows", 1, params.mNumRows); @@ -205,7 +205,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // [2] [1]| public void testLayout2KeyR0() { - MiniKeyboardParams params = new MiniKeyboardParams(2, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(2, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_R0, KEYBOARD_WIDTH); assertEquals("2 key R0 columns", 2, params.mNumColumns); assertEquals("2 key R0 rows", 1, params.mNumRows); @@ -219,7 +219,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // [2] [1] ___| public void testLayout2KeyR1() { - MiniKeyboardParams params = new MiniKeyboardParams(2, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(2, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_R1, KEYBOARD_WIDTH); assertEquals("2 key R1 columns", 2, params.mNumColumns); assertEquals("2 key R1 rows", 1, params.mNumRows); @@ -233,7 +233,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // [1] [2] ___ ___| public void testLayout2KeyR2() { - MiniKeyboardParams params = new MiniKeyboardParams(2, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(2, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_R2, KEYBOARD_WIDTH); assertEquals("2 key R2 columns", 2, params.mNumColumns); assertEquals("2 key R2 rows", 1, params.mNumRows); @@ -247,7 +247,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // [3] [1] [2] public void testLayout3KeyM0() { - MiniKeyboardParams params = new MiniKeyboardParams(3, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(3, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_M0, KEYBOARD_WIDTH); assertEquals("3 key columns", 3, params.mNumColumns); assertEquals("3 key rows", 1, params.mNumRows); @@ -262,7 +262,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // |[1] [2] [3] public void testLayout3KeyL0() { - MiniKeyboardParams params = new MiniKeyboardParams(3, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(3, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_L0, KEYBOARD_WIDTH); assertEquals("3 key L0 columns", 3, params.mNumColumns); assertEquals("3 key L0 rows", 1, params.mNumRows); @@ -277,7 +277,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // |___ [1] [2] [3] public void testLayout3KeyL1() { - MiniKeyboardParams params = new MiniKeyboardParams(3, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(3, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_L1, KEYBOARD_WIDTH); assertEquals("3 key L1 columns", 3, params.mNumColumns); assertEquals("3 key L1 rows", 1, params.mNumRows); @@ -292,7 +292,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // |___ ___ [3] [1] [2] public void testLayout3KeyL2() { - MiniKeyboardParams params = new MiniKeyboardParams(3, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(3, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_L2, KEYBOARD_WIDTH); assertEquals("3 key L2 columns", 3, params.mNumColumns); assertEquals("3 key L2 rows", 1, params.mNumRows); @@ -307,7 +307,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // [3] [2] [1]| public void testLayout3KeyR0() { - MiniKeyboardParams params = new MiniKeyboardParams(3, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(3, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_R0, KEYBOARD_WIDTH); assertEquals("3 key R0 columns", 3, params.mNumColumns); assertEquals("3 key R0 rows", 1, params.mNumRows); @@ -322,7 +322,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // [3] [2] [1] ___| public void testLayout3KeyR1() { - MiniKeyboardParams params = new MiniKeyboardParams(3, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(3, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_R1, KEYBOARD_WIDTH); assertEquals("3 key R1 columns", 3, params.mNumColumns); assertEquals("3 key R1 rows", 1, params.mNumRows); @@ -337,7 +337,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // [3] [1] [2] ___ ___| public void testLayout3KeyR2() { - MiniKeyboardParams params = new MiniKeyboardParams(3, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(3, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_R2, KEYBOARD_WIDTH); assertEquals("3 key R2 columns", 3, params.mNumColumns); assertEquals("3 key R2 rows", 1, params.mNumRows); @@ -352,7 +352,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // [3] [1] [2] [4] public void testLayout4KeyM0() { - MiniKeyboardParams params = new MiniKeyboardParams(4, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(4, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_M0, KEYBOARD_WIDTH); assertEquals("4 key columns", 4, params.mNumColumns); assertEquals("4 key rows", 1, params.mNumRows); @@ -368,7 +368,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // |[1] [2] [3] [4] public void testLayout4KeyL0() { - MiniKeyboardParams params = new MiniKeyboardParams(4, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(4, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_L0, KEYBOARD_WIDTH); assertEquals("4 key L0 columns", 4, params.mNumColumns); assertEquals("4 key L0 rows", 1, params.mNumRows); @@ -384,7 +384,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // |___ [1] [2] [3] [4] public void testLayout4KeyL1() { - MiniKeyboardParams params = new MiniKeyboardParams(4, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(4, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_L1, KEYBOARD_WIDTH); assertEquals("4 key L1 columns", 4, params.mNumColumns); assertEquals("4 key L1 rows", 1, params.mNumRows); @@ -400,7 +400,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // |___ ___ [3] [1] [2] [4] public void testLayout4KeyL2() { - MiniKeyboardParams params = new MiniKeyboardParams(4, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(4, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_L2, KEYBOARD_WIDTH); assertEquals("4 key L2 columns", 4, params.mNumColumns); assertEquals("4 key L2 rows", 1, params.mNumRows); @@ -416,7 +416,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // [4] [3] [2] [1]| public void testLayout4KeyR0() { - MiniKeyboardParams params = new MiniKeyboardParams(4, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(4, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_R0, KEYBOARD_WIDTH); assertEquals("4 key R0 columns", 4, params.mNumColumns); assertEquals("4 key R0 rows", 1, params.mNumRows); @@ -432,7 +432,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // [4] [3] [2] [1] ___| public void testLayout4KeyR1() { - MiniKeyboardParams params = new MiniKeyboardParams(4, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(4, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_R1, KEYBOARD_WIDTH); assertEquals("4 key R1 columns", 4, params.mNumColumns); assertEquals("4 key R1 rows", 1, params.mNumRows); @@ -448,7 +448,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // [4] [3] [1] [2] ___ ___| public void testLayout4KeyR2() { - MiniKeyboardParams params = new MiniKeyboardParams(4, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(4, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_R2, KEYBOARD_WIDTH); assertEquals("4 key R2 columns", 4, params.mNumColumns); assertEquals("4 key R2 rows", 1, params.mNumRows); @@ -464,7 +464,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // [5] [3] [1] [2] [4] public void testLayout5KeyM0() { - MiniKeyboardParams params = new MiniKeyboardParams(5, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(5, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_M0, KEYBOARD_WIDTH); assertEquals("5 key columns", 5, params.mNumColumns); assertEquals("5 key rows", 1, params.mNumRows); @@ -481,7 +481,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // |[1] [2] [3] [4] [5] public void testLayout5KeyL0() { - MiniKeyboardParams params = new MiniKeyboardParams(5, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(5, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_L0, KEYBOARD_WIDTH); assertEquals("5 key L0 columns", 5, params.mNumColumns); assertEquals("5 key L0 rows", 1, params.mNumRows); @@ -498,7 +498,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // |___ [1] [2] [3] [4] [5] public void testLayout5KeyL1() { - MiniKeyboardParams params = new MiniKeyboardParams(5, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(5, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_L1, KEYBOARD_WIDTH); assertEquals("5 key L1 columns", 5, params.mNumColumns); assertEquals("5 key L1 rows", 1, params.mNumRows); @@ -515,7 +515,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // |___ ___ [3] [1] [2] [4] [5] public void testLayout5KeyL2() { - MiniKeyboardParams params = new MiniKeyboardParams(5, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(5, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_L2, KEYBOARD_WIDTH); assertEquals("5 key L2 columns", 5, params.mNumColumns); assertEquals("5 key L2 rows", 1, params.mNumRows); @@ -532,7 +532,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // [5] [4] [3] [2] [1]| public void testLayout5KeyR0() { - MiniKeyboardParams params = new MiniKeyboardParams(5, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(5, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_R0, KEYBOARD_WIDTH); assertEquals("5 key R0 columns", 5, params.mNumColumns); assertEquals("5 key R0 rows", 1, params.mNumRows); @@ -549,7 +549,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // [5] [4] [3] [2] [1] ___| public void testLayout5KeyR1() { - MiniKeyboardParams params = new MiniKeyboardParams(5, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(5, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_R1, KEYBOARD_WIDTH); assertEquals("5 key R1 columns", 5, params.mNumColumns); assertEquals("5 key R1 rows", 1, params.mNumRows); @@ -566,7 +566,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // [5] [4] [3] [1] [2] ___ ___| public void testLayout5KeyR2() { - MiniKeyboardParams params = new MiniKeyboardParams(5, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(5, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_R2, KEYBOARD_WIDTH); assertEquals("5 key R2 columns", 5, params.mNumColumns); assertEquals("5 key R2 rows", 1, params.mNumRows); @@ -584,7 +584,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // [6] [4] [5] // [3] [1] [2] public void testLayout6KeyM0() { - MiniKeyboardParams params = new MiniKeyboardParams(6, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(6, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_M0, KEYBOARD_WIDTH); assertEquals("6 key columns", 3, params.mNumColumns); assertEquals("6 key rows", 2, params.mNumRows); @@ -603,7 +603,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // |[4] [5] [6] // |[1] [2] [3] public void testLayout6KeyL0() { - MiniKeyboardParams params = new MiniKeyboardParams(6, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(6, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_L0, KEYBOARD_WIDTH); assertEquals("6 key L0 columns", 3, params.mNumColumns); assertEquals("6 key L0 rows", 2, params.mNumRows); @@ -622,7 +622,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // |___ [4] [5] [6] // |___ [1] [2] [3] public void testLayout6KeyL1() { - MiniKeyboardParams params = new MiniKeyboardParams(6, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(6, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_L1, KEYBOARD_WIDTH); assertEquals("6 key L1 columns", 3, params.mNumColumns); assertEquals("6 key L1 rows", 2, params.mNumRows); @@ -641,7 +641,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // |___ ___ [6] [4] [5] // |___ ___ [3] [1] [2] public void testLayout6KeyL2() { - MiniKeyboardParams params = new MiniKeyboardParams(6, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(6, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_L2, KEYBOARD_WIDTH); assertEquals("6 key L2 columns", 3, params.mNumColumns); assertEquals("6 key L2 rows", 2, params.mNumRows); @@ -660,7 +660,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // [6] [5] [4]| // [3] [2] [1]| public void testLayout6KeyR0() { - MiniKeyboardParams params = new MiniKeyboardParams(6, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(6, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_R0, KEYBOARD_WIDTH); assertEquals("6 key R0 columns", 3, params.mNumColumns); assertEquals("6 key R0 rows", 2, params.mNumRows); @@ -679,7 +679,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // [6] [5] [4] ___| // [3] [2] [1] ___| public void testLayout6KeyR1() { - MiniKeyboardParams params = new MiniKeyboardParams(6, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(6, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_R1, KEYBOARD_WIDTH); assertEquals("6 key R1 columns", 3, params.mNumColumns); assertEquals("6 key R1 rows", 2, params.mNumRows); @@ -698,7 +698,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // [6] [4] [5] ___ ___| // [3] [1] [2] ___ ___| public void testLayout6KeyR2() { - MiniKeyboardParams params = new MiniKeyboardParams(6, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(6, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_R2, KEYBOARD_WIDTH); assertEquals("6 key R2 columns", 3, params.mNumColumns); assertEquals("6 key R2 rows", 2, params.mNumRows); @@ -717,7 +717,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // [7] [5] [6] // [3] [1] [2] [4] public void testLayout7KeyM0() { - MiniKeyboardParams params = new MiniKeyboardParams(7, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(7, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_M0, KEYBOARD_WIDTH); assertEquals("7 key columns", 4, params.mNumColumns); assertEquals("7 key rows", 2, params.mNumRows); @@ -737,7 +737,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // |[5] [6] [7] // |[1] [2] [3] [4] public void testLayout7KeyL0() { - MiniKeyboardParams params = new MiniKeyboardParams(7, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(7, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_L0, KEYBOARD_WIDTH); assertEquals("7 key L0 columns", 4, params.mNumColumns); assertEquals("7 key L0 rows", 2, params.mNumRows); @@ -757,7 +757,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // |___ [5] [6] [7] // |___ [1] [2] [3] [4] public void testLayout7KeyL1() { - MiniKeyboardParams params = new MiniKeyboardParams(7, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(7, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_L1, KEYBOARD_WIDTH); assertEquals("7 key L1 columns", 4, params.mNumColumns); assertEquals("7 key L1 rows", 2, params.mNumRows); @@ -777,7 +777,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // |___ ___ [7] [5] [6] // |___ ___ [3] [1] [2] [4] public void testLayout7KeyL2() { - MiniKeyboardParams params = new MiniKeyboardParams(7, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(7, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_L2, KEYBOARD_WIDTH); assertEquals("7 key L2 columns", 4, params.mNumColumns); assertEquals("7 key L2 rows", 2, params.mNumRows); @@ -797,7 +797,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // [7] [6] [5]| // [4] [3] [2] [1]| public void testLayout7KeyR0() { - MiniKeyboardParams params = new MiniKeyboardParams(7, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(7, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_R0, KEYBOARD_WIDTH); assertEquals("7 key R0 columns", 4, params.mNumColumns); assertEquals("7 key R0 rows", 2, params.mNumRows); @@ -817,7 +817,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // [7] [6] [5] ___| // [4] [3] [2] [1] ___| public void testLayout7KeyR1() { - MiniKeyboardParams params = new MiniKeyboardParams(7, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(7, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_R1, KEYBOARD_WIDTH); assertEquals("7 key R1 columns", 4, params.mNumColumns); assertEquals("7 key R1 rows", 2, params.mNumRows); @@ -837,7 +837,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // [7] [5] [6] ___ ___| // [4] [3] [1] [2] ___ ___| public void testLayout7KeyR2() { - MiniKeyboardParams params = new MiniKeyboardParams(7, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(7, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_R2, KEYBOARD_WIDTH); assertEquals("7 key R2 columns", 4, params.mNumColumns); assertEquals("7 key R2 rows", 2, params.mNumRows); @@ -856,7 +856,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // [7] [6] [5] [3] [1] [2] [4] ___| public void testLayout7KeyR3Max7() { - MiniKeyboardParams params = new MiniKeyboardParams(7, 7, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(7, 7, WIDTH, HEIGHT, XPOS_R3, KEYBOARD_WIDTH); assertEquals("7 key R2 columns", 7, params.mNumColumns); assertEquals("7 key R2 rows", 1, params.mNumRows); @@ -876,7 +876,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // [7] [5] [6] [8] // [3] [1] [2] [4] public void testLayout8KeyM0() { - MiniKeyboardParams params = new MiniKeyboardParams(8, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(8, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_M0, KEYBOARD_WIDTH); assertEquals("8 key M0 columns", 4, params.mNumColumns); assertEquals("8 key M0 rows", 2, params.mNumRows); @@ -897,7 +897,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // |[5] [6] [7] [8] // |[1] [2] [3] [4] public void testLayout8KeyL0() { - MiniKeyboardParams params = new MiniKeyboardParams(8, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(8, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_L0, KEYBOARD_WIDTH); assertEquals("8 key L0 columns", 4, params.mNumColumns); assertEquals("8 key L0 rows", 2, params.mNumRows); @@ -918,7 +918,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // |___ [5] [6] [7] [8] // |___ [1] [2] [3] [4] public void testLayout8KeyL1() { - MiniKeyboardParams params = new MiniKeyboardParams(8, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(8, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_L1, KEYBOARD_WIDTH); assertEquals("8 key L1 columns", 4, params.mNumColumns); assertEquals("8 key L1 rows", 2, params.mNumRows); @@ -939,7 +939,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // |___ ___ [7] [5] [6] [8] // |___ ___ [3] [1] [2] [4] public void testLayout8KeyL2() { - MiniKeyboardParams params = new MiniKeyboardParams(8, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(8, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_L2, KEYBOARD_WIDTH); assertEquals("8 key L2 columns", 4, params.mNumColumns); assertEquals("8 key L2 rows", 2, params.mNumRows); @@ -960,7 +960,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // [8] [7] [6] [5]| // [4] [3] [2] [1]| public void testLayout8KeyR0() { - MiniKeyboardParams params = new MiniKeyboardParams(8, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(8, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_R0, KEYBOARD_WIDTH); assertEquals("8 key R0 columns", 4, params.mNumColumns); assertEquals("8 key R0 rows", 2, params.mNumRows); @@ -981,7 +981,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // [8] [7] [6] [5] ___| // [4] [3] [2] [1] ___| public void testLayout8KeyR1() { - MiniKeyboardParams params = new MiniKeyboardParams(8, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(8, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_R1, KEYBOARD_WIDTH); assertEquals("8 key R1 columns", 4, params.mNumColumns); assertEquals("8 key R1 rows", 2, params.mNumRows); @@ -1002,7 +1002,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // [8] [7] [5] [6] ___ ___| // [4] [3] [1] [2] ___ ___| public void testLayout8KeyR2() { - MiniKeyboardParams params = new MiniKeyboardParams(8, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(8, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_R2, KEYBOARD_WIDTH); assertEquals("8 key R2 columns", 4, params.mNumColumns); assertEquals("8 key R2 rows", 2, params.mNumRows); @@ -1023,7 +1023,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // [8] [6] [7] [9] // [5] [3] [1] [2] [4] public void testLayout9KeyM0() { - MiniKeyboardParams params = new MiniKeyboardParams(9, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(9, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_M0, KEYBOARD_WIDTH); assertEquals("9 key M0 columns", 5, params.mNumColumns); assertEquals("9 key M0 rows", 2, params.mNumRows); @@ -1045,7 +1045,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // |[6] [7] [8] [9] // |[1] [2] [3] [4] [5] public void testLayout9KeyL0() { - MiniKeyboardParams params = new MiniKeyboardParams(9, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(9, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_L0, KEYBOARD_WIDTH); assertEquals("9 key L0 columns", 5, params.mNumColumns); assertEquals("9 key L0 rows", 2, params.mNumRows); @@ -1067,7 +1067,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // |___ [6] [7] [8] [9] // |___ [1] [2] [3] [4] [5] public void testLayout9KeyL1() { - MiniKeyboardParams params = new MiniKeyboardParams(9, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(9, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_L1, KEYBOARD_WIDTH); assertEquals("9 key L1 columns", 5, params.mNumColumns); assertEquals("9 key L1 rows", 2, params.mNumRows); @@ -1089,7 +1089,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // |___ ___ [8] [6] [7] [9] // |___ ___ [3] [1] [2] [4] [5] public void testLayout9KeyL2() { - MiniKeyboardParams params = new MiniKeyboardParams(9, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(9, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_L2, KEYBOARD_WIDTH); assertEquals("9 key L2 columns", 5, params.mNumColumns); assertEquals("9 key L2 rows", 2, params.mNumRows); @@ -1111,7 +1111,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // [9] [8] [7] [6]| // [5] [4] [3] [2] [1]| public void testLayout9KeyR0() { - MiniKeyboardParams params = new MiniKeyboardParams(9, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(9, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_R0, KEYBOARD_WIDTH); assertEquals("9 key R0 columns", 5, params.mNumColumns); assertEquals("9 key R0 rows", 2, params.mNumRows); @@ -1133,7 +1133,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // [9] [8] [7] [6] ___| // [5] [4] [3] [2] [1] ___| public void testLayout9KeyR1() { - MiniKeyboardParams params = new MiniKeyboardParams(9, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(9, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_R1, KEYBOARD_WIDTH); assertEquals("9 key R1 columns", 5, params.mNumColumns); assertEquals("9 key R1 rows", 2, params.mNumRows); @@ -1155,7 +1155,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // [9] [8] [6] [7] ___ ___| // [5] [4] [3] [1] [2] ___ ___| public void testLayout9KeyR2() { - MiniKeyboardParams params = new MiniKeyboardParams(9, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(9, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_R2, KEYBOARD_WIDTH); assertEquals("9 key R2 columns", 5, params.mNumColumns); assertEquals("9 key R2 rows", 2, params.mNumRows); @@ -1177,7 +1177,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // [A] [8] [6] [7] [9] // [5] [3] [1] [2] [4] public void testLayout10KeyM0() { - MiniKeyboardParams params = new MiniKeyboardParams(10, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(10, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_M0, KEYBOARD_WIDTH); assertEquals("10 key M0 columns", 5, params.mNumColumns); assertEquals("10 key M0 rows", 2, params.mNumRows); @@ -1200,7 +1200,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // |[6] [7] [8] [9] [A] // |[1] [2] [3] [4] [5] public void testLayout10KeyL0() { - MiniKeyboardParams params = new MiniKeyboardParams(10, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(10, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_L0, KEYBOARD_WIDTH); assertEquals("10 key L0 columns", 5, params.mNumColumns); assertEquals("10 key L0 rows", 2, params.mNumRows); @@ -1223,7 +1223,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // |___ [6] [7] [8] [9] [A] // |___ [1] [2] [3] [4] [5] public void testLayout10KeyL1() { - MiniKeyboardParams params = new MiniKeyboardParams(10, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(10, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_L1, KEYBOARD_WIDTH); assertEquals("10 key L1 columns", 5, params.mNumColumns); assertEquals("10 key L1 rows", 2, params.mNumRows); @@ -1246,7 +1246,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // |___ ___ [8] [6] [7] [9] [A] // |___ ___ [3] [1] [2] [4] [5] public void testLayout10KeyL2() { - MiniKeyboardParams params = new MiniKeyboardParams(10, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(10, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_L2, KEYBOARD_WIDTH); assertEquals("10 key L2 columns", 5, params.mNumColumns); assertEquals("10 key L2 rows", 2, params.mNumRows); @@ -1269,7 +1269,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // [A] [9] [8] [7] [6]| // [5] [4] [3] [2] [1]| public void testLayout10KeyR0() { - MiniKeyboardParams params = new MiniKeyboardParams(10, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(10, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_R0, KEYBOARD_WIDTH); assertEquals("10 key R0 columns", 5, params.mNumColumns); assertEquals("10 key R0 rows", 2, params.mNumRows); @@ -1292,7 +1292,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // [A] [9] [8] [7] [6] ___| // [5] [4] [3] [2] [1] ___| public void testLayout10KeyR1() { - MiniKeyboardParams params = new MiniKeyboardParams(10, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(10, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_R1, KEYBOARD_WIDTH); assertEquals("10 key R1 columns", 5, params.mNumColumns); assertEquals("10 key R1 rows", 2, params.mNumRows); @@ -1315,7 +1315,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // [A] [9] [8] [6] [7] ___ ___| // [5] [4] [3] [1] [2] ___ ___| public void testLayout10KeyR2() { - MiniKeyboardParams params = new MiniKeyboardParams(10, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(10, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_R2, KEYBOARD_WIDTH); assertEquals("10 key R2 columns", 5, params.mNumColumns); assertEquals("10 key R2 rows", 2, params.mNumRows); @@ -1339,7 +1339,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // [7] [5] [6] [8] // [3] [1] [2] [4] public void testLayout11KeyM0() { - MiniKeyboardParams params = new MiniKeyboardParams(11, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(11, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_M0, KEYBOARD_WIDTH); assertEquals("11 key M0 columns", 4, params.mNumColumns); assertEquals("11 key M0 rows", 3, params.mNumRows); @@ -1364,7 +1364,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // [7] [5] [6] [8] // [3] [1] [2] [4] public void testLayout12KeyM0() { - MiniKeyboardParams params = new MiniKeyboardParams(12, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(12, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_M0, KEYBOARD_WIDTH); assertEquals("12 key M0 columns", 4, params.mNumColumns); assertEquals("12 key M0 rows", 3, params.mNumRows); @@ -1391,7 +1391,7 @@ public class MiniKeyboardBuilderTests extends AndroidTestCase { // [A] [8] [6] [7] [9] // [5] [3] [1] [2] [4] public void testLayout13KeyM0() { - MiniKeyboardParams params = new MiniKeyboardParams(13, MAX_COLUMNS, WIDTH, + MoreKeysKeyboardParams params = new MoreKeysKeyboardParams(13, MAX_COLUMNS, WIDTH, HEIGHT, XPOS_M0, KEYBOARD_WIDTH); assertEquals("13 key M0 columns", 5, params.mNumColumns); assertEquals("13 key M0 rows", 3, params.mNumRows);