diff options
author | 2012-05-14 19:17:09 +0900 | |
---|---|---|
committer | 2012-05-15 12:27:34 +0900 | |
commit | 30236efee1bdac32d2c5b5c2875191a05e690865 (patch) | |
tree | cf82ff0b56d24075d9907d54f666991d09310c3a /java/src | |
parent | ea468ee6875fb0d491490327dfa08ef9b5599882 (diff) | |
download | latinime-30236efee1bdac32d2c5b5c2875191a05e690865.tar.gz latinime-30236efee1bdac32d2c5b5c2875191a05e690865.tar.xz latinime-30236efee1bdac32d2c5b5c2875191a05e690865.zip |
Remove "fillBoth" enum value from keyWidth attribute of Key
Change-Id: Icc5ffb8286aeda298b46aeba05e44608e342bc57
Diffstat (limited to 'java/src')
-rw-r--r-- | java/src/com/android/inputmethod/keyboard/Keyboard.java | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/Keyboard.java b/java/src/com/android/inputmethod/keyboard/Keyboard.java index 28855f561..bd3b0e114 100644 --- a/java/src/com/android/inputmethod/keyboard/Keyboard.java +++ b/java/src/com/android/inputmethod/keyboard/Keyboard.java @@ -511,7 +511,6 @@ public class Keyboard { // keyWidth enum constants private static final int KEYWIDTH_NOT_ENUM = 0; private static final int KEYWIDTH_FILL_RIGHT = -1; - private static final int KEYWIDTH_FILL_BOTH = -2; private final Params mParams; /** Default width of a key in this row. */ @@ -576,11 +575,6 @@ public class Keyboard { public float getKeyX(TypedArray keyAttr) { final int widthType = Builder.getEnumValue(keyAttr, R.styleable.Keyboard_Key_keyWidth, KEYWIDTH_NOT_ENUM); - if (widthType == KEYWIDTH_FILL_BOTH) { - // If keyWidth is fillBoth, the key width should start right after the nearest - // key on the left hand side. - return mCurrentX; - } final int keyboardRightEdge = mParams.mOccupiedWidth - mParams.mHorizontalEdgesPadding; @@ -610,14 +604,10 @@ public class Keyboard { R.styleable.Keyboard_Key_keyWidth, KEYWIDTH_NOT_ENUM); switch (widthType) { case KEYWIDTH_FILL_RIGHT: - case KEYWIDTH_FILL_BOTH: final int keyboardRightEdge = mParams.mOccupiedWidth - mParams.mHorizontalEdgesPadding; // If keyWidth is fillRight, the actual key width will be determined to fill // out the area up to the right edge of the keyboard. - // If keyWidth is fillBoth, the actual key width will be determined to fill out - // the area between the nearest key on the left hand side and the right edge of - // the keyboard. return keyboardRightEdge - keyXPos; default: // KEYWIDTH_NOT_ENUM return Builder.getDimensionOrFraction(keyAttr, |