Use Math.round instead of (int) to convert Key coordinates from float to int
Bug: 6566563 Change-Id: I97d1e9727077cb4d9abbf1ad5bd5d3f061c7bce7main
parent
aa0641394b
commit
8f590c77e8
|
@ -217,21 +217,22 @@ public class Key {
|
||||||
final int keyYPos = row.getKeyY();
|
final int keyYPos = row.getKeyY();
|
||||||
|
|
||||||
// Horizontal gap is divided equally to both sides of the key.
|
// Horizontal gap is divided equally to both sides of the key.
|
||||||
mX = (int) (keyXPos + horizontalGap / 2);
|
mX = Math.round(keyXPos + horizontalGap / 2);
|
||||||
mY = keyYPos;
|
mY = keyYPos;
|
||||||
mWidth = (int) (keyWidth - horizontalGap);
|
mWidth = Math.round(keyWidth - horizontalGap);
|
||||||
mHorizontalGap = (int) horizontalGap;
|
mHorizontalGap = Math.round(horizontalGap);
|
||||||
mHitBox.set((int)keyXPos, keyYPos, (int)(keyXPos + keyWidth) + 1, keyYPos + keyHeight);
|
mHitBox.set(Math.round(keyXPos), keyYPos, Math.round(keyXPos + keyWidth) + 1,
|
||||||
|
keyYPos + keyHeight);
|
||||||
// Update row to have current x coordinate.
|
// Update row to have current x coordinate.
|
||||||
row.setXPos(keyXPos + keyWidth);
|
row.setXPos(keyXPos + keyWidth);
|
||||||
|
|
||||||
mBackgroundType = style.getInt(keyAttr,
|
mBackgroundType = style.getInt(keyAttr,
|
||||||
R.styleable.Keyboard_Key_backgroundType, BACKGROUND_TYPE_NORMAL);
|
R.styleable.Keyboard_Key_backgroundType, BACKGROUND_TYPE_NORMAL);
|
||||||
|
|
||||||
mVisualInsetsLeft = (int) Keyboard.Builder.getDimensionOrFraction(keyAttr,
|
mVisualInsetsLeft = Math.round(Keyboard.Builder.getDimensionOrFraction(keyAttr,
|
||||||
R.styleable.Keyboard_Key_visualInsetsLeft, params.mBaseWidth, 0);
|
R.styleable.Keyboard_Key_visualInsetsLeft, params.mBaseWidth, 0));
|
||||||
mVisualInsetsRight = (int) Keyboard.Builder.getDimensionOrFraction(keyAttr,
|
mVisualInsetsRight = Math.round(Keyboard.Builder.getDimensionOrFraction(keyAttr,
|
||||||
R.styleable.Keyboard_Key_visualInsetsRight, params.mBaseWidth, 0);
|
R.styleable.Keyboard_Key_visualInsetsRight, params.mBaseWidth, 0));
|
||||||
mIconId = KeySpecParser.getIconId(style.getString(keyAttr,
|
mIconId = KeySpecParser.getIconId(style.getString(keyAttr,
|
||||||
R.styleable.Keyboard_Key_keyIcon));
|
R.styleable.Keyboard_Key_keyIcon));
|
||||||
mDisabledIconId = KeySpecParser.getIconId(style.getString(keyAttr,
|
mDisabledIconId = KeySpecParser.getIconId(style.getString(keyAttr,
|
||||||
|
|
Loading…
Reference in New Issue