am 74b89db8: Merge "Fix key label padding" into jb-mr1-dev
* commit '74b89db8a4524cd702a46bc975a6af0e4fcfc7e4': Fix key label paddingmain
commit
c132476af0
|
@ -221,13 +221,13 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy {
|
||||||
mKeyDrawParams = new KeyDrawParams(keyboardViewAttr, keyAttr);
|
mKeyDrawParams = new KeyDrawParams(keyboardViewAttr, keyAttr);
|
||||||
mKeyPreviewDrawParams = new KeyPreviewDrawParams(keyboardViewAttr, keyAttr);
|
mKeyPreviewDrawParams = new KeyPreviewDrawParams(keyboardViewAttr, keyAttr);
|
||||||
mDelayAfterPreview = mKeyPreviewDrawParams.mLingerTimeout;
|
mDelayAfterPreview = mKeyPreviewDrawParams.mLingerTimeout;
|
||||||
mKeyLabelHorizontalPadding = keyAttr.getDimensionPixelOffset(
|
mKeyLabelHorizontalPadding = keyboardViewAttr.getDimensionPixelOffset(
|
||||||
R.styleable.KeyboardView_keyLabelHorizontalPadding, 0);
|
R.styleable.KeyboardView_keyLabelHorizontalPadding, 0);
|
||||||
mKeyHintLetterPadding = keyAttr.getDimension(
|
mKeyHintLetterPadding = keyboardViewAttr.getDimension(
|
||||||
R.styleable.KeyboardView_keyHintLetterPadding, 0);
|
R.styleable.KeyboardView_keyHintLetterPadding, 0);
|
||||||
mKeyPopupHintLetterPadding = keyAttr.getDimension(
|
mKeyPopupHintLetterPadding = keyboardViewAttr.getDimension(
|
||||||
R.styleable.KeyboardView_keyPopupHintLetterPadding, 0);
|
R.styleable.KeyboardView_keyPopupHintLetterPadding, 0);
|
||||||
mKeyShiftedLetterHintPadding = keyAttr.getDimension(
|
mKeyShiftedLetterHintPadding = keyboardViewAttr.getDimension(
|
||||||
R.styleable.KeyboardView_keyShiftedLetterHintPadding, 0);
|
R.styleable.KeyboardView_keyShiftedLetterHintPadding, 0);
|
||||||
mKeyPreviewLayoutId = keyboardViewAttr.getResourceId(
|
mKeyPreviewLayoutId = keyboardViewAttr.getResourceId(
|
||||||
R.styleable.KeyboardView_keyPreviewLayout, 0);
|
R.styleable.KeyboardView_keyPreviewLayout, 0);
|
||||||
|
|
Loading…
Reference in New Issue