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

am 18546fa9: Merge "Make all KeyboardRow attributes private" 

* commit '18546fa92c1dd11f76f2d8be244b0214a3514b02':
  Make all KeyboardRow attributes private
main
Tadashi G. Takaoka 2013-08-18 19:43:38 -07:00 committed by Android Git Automerger
parent 41aade7977 18546fa92c
commit 6fc8e32d02
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -234,7 +234,7 @@ public class Key implements Comparable<Key> {
public Key(final Resources res, final KeyboardParams params, final KeyboardRow row, public Key(final Resources res, final KeyboardParams params, final KeyboardRow row,
final XmlPullParser parser) throws XmlPullParserException { final XmlPullParser parser) throws XmlPullParserException {
final float horizontalGap = isSpacer() ? 0 : params.mHorizontalGap; final float horizontalGap = isSpacer() ? 0 : params.mHorizontalGap;
final int rowHeight = row.mRowHeight; final int rowHeight = row.getRowHeight();
mHeight = rowHeight - params.mVerticalGap; mHeight = rowHeight - params.mVerticalGap;
final TypedArray keyAttr = res.obtainAttributes(Xml.asAttributeSet(parser), final TypedArray keyAttr = res.obtainAttributes(Xml.asAttributeSet(parser),

2
java/src/com/android/inputmethod/keyboard/internal/KeyboardBuilder.java
View File

@ -745,7 +745,7 @@ public class KeyboardBuilder<KP extends KeyboardParams> {
mRightEdgeKey = null; mRightEdgeKey = null;
} }
addEdgeSpace(mParams.mRightPadding, row); addEdgeSpace(mParams.mRightPadding, row);
mCurrentY += row.mRowHeight; mCurrentY += row.getRowHeight();
mCurrentRow = null; mCurrentRow = null;
mTopEdge = false; mTopEdge = false;
} }

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

@ -38,10 +38,10 @@ public final class KeyboardRow {
private static final int KEYWIDTH_FILL_RIGHT = -1; private static final int KEYWIDTH_FILL_RIGHT = -1;
private final KeyboardParams mParams; private final KeyboardParams mParams;
/** The height of this row. */
private final int mRowHeight;
/** Default width of a key in this row. */ /** Default width of a key in this row. */
private float mDefaultKeyWidth; private float mDefaultKeyWidth;
/** Default height of a key in this row. */
public final int mRowHeight;
/** Default keyLabelFlags in this row. */ /** Default keyLabelFlags in this row. */
private int mDefaultKeyLabelFlags; private int mDefaultKeyLabelFlags;
/** Default backgroundType for this row */ /** Default backgroundType for this row */
@ -74,6 +74,10 @@ public final class KeyboardRow {
mCurrentX = 0.0f; mCurrentX = 0.0f;
} }
public int getRowHeight() {
return mRowHeight;
}
public float getDefaultKeyWidth() { public float getDefaultKeyWidth() {
return mDefaultKeyWidth; return mDefaultKeyWidth;
} }