Merge "Make all KeyboardRow attributes private" (18546fa9) · Commits · e / os / android_packages_inputmethods_LatinIME

java/src/com/android/inputmethod/keyboard/Key.java

+1 −1

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

		final TypedArray keyAttr = res.obtainAttributes(Xml.asAttributeSet(parser),

+1 −1

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

+6 −2

Original line number	Diff line number	Diff line
		@@ -38,10 +38,10 @@ public final class KeyboardRow {
		private static final int KEYWIDTH_FILL_RIGHT = -1;

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

		public int getRowHeight() {
		return mRowHeight;
		}

		public float getDefaultKeyWidth() {
		return mDefaultKeyWidth;
		}