nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make horigontalGap and verticalGap attributes of Row obsolete 

Bug: 5023981
Change-Id: Ifb07b54a68cfdd32ff2ea79812188fb6158bd073
main
Tadashi G. Takaoka 2011-08-01 17:02:47 -07:00
parent 723dd753e9
commit 4d8eb2e888
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
java/src/com/android/inputmethod/keyboard/Key.java
View File

@ -237,10 +237,10 @@ public class Key {
try {
mHeight = KeyboardParser.getDimensionOrFraction(keyboardAttr,
R.styleable.Keyboard_rowHeight,
keyboard.getKeyboardHeight(), row.mDefaultHeight) - row.mVerticalGap;
keyboard.getKeyboardHeight(), row.mDefaultHeight) - keyboard.getVerticalGap();
mHorizontalGap = KeyboardParser.getDimensionOrFraction(keyboardAttr,
R.styleable.Keyboard_horizontalGap,
keyboard.getDisplayWidth(), row.mDefaultHorizontalGap);
keyboard.getDisplayWidth(), keyboard.getHorizontalGap());
mVerticalGap = keyboard.getVerticalGap();
keyWidth = KeyboardParser.getDimensionOrFraction(keyboardAttr,
R.styleable.Keyboard_keyWidth,

16
java/src/com/android/inputmethod/keyboard/internal/KeyboardParser.java
View File

@ -256,7 +256,7 @@ public class KeyboardParser {
if (event == XmlPullParser.START_TAG) {
final String tag = parser.getName();
if (TAG_ROW.equals(tag)) {
Row row = new Row(mResources, mKeyboard, parser);
Row row = parseRowAttributes(parser);
if (DEBUG) Log.d(TAG, String.format("<%s>", TAG_ROW));
if (keys != null)
startRow(row);
@ -288,6 +288,20 @@ public class KeyboardParser {
}
}
private Row parseRowAttributes(XmlResourceParser parser) {
final TypedArray a = mResources.obtainAttributes(Xml.asAttributeSet(parser),
R.styleable.Keyboard);
try {
if (a.hasValue(R.styleable.Keyboard_horizontalGap))
throw new IllegalAttribute(parser, "horizontalGap");
if (a.hasValue(R.styleable.Keyboard_verticalGap))
throw new IllegalAttribute(parser, "verticalGap");
return new Row(mResources, mKeyboard, parser);
} finally {
a.recycle();
}
}
private void parseRowContent(XmlResourceParser parser, Row row, List<Key> keys)
throws XmlPullParserException, IOException {
int event;

8
java/src/com/android/inputmethod/keyboard/internal/Row.java
View File

@ -34,10 +34,6 @@ public class Row {
public final int mDefaultWidth;
/** Default height of a key in this row. */
public final int mDefaultHeight;
/** Default horizontal gap between keys in this row. */
public final int mDefaultHorizontalGap;
/** Vertical gap following this row. */
public final int mVerticalGap;
private final Keyboard mKeyboard;
@ -51,10 +47,6 @@ public class Row {
R.styleable.Keyboard_keyWidth, keyboardWidth, keyboard.getKeyWidth());
mDefaultHeight = KeyboardParser.getDimensionOrFraction(a,
R.styleable.Keyboard_rowHeight, keyboardHeight, keyboard.getRowHeight());
mDefaultHorizontalGap = KeyboardParser.getDimensionOrFraction(a,
R.styleable.Keyboard_horizontalGap, keyboardWidth, keyboard.getHorizontalGap());
mVerticalGap = KeyboardParser.getDimensionOrFraction(a,
R.styleable.Keyboard_verticalGap, keyboardHeight, keyboard.getVerticalGap());
a.recycle();
}