diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2012-08-31 04:00:15 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-08-31 04:00:15 -0700 |
| commit | c132476af074aea8cd58f734140ff9b50698df2b (patch) | |
| tree | 15ce4e1a74e3c0f9d857c73741149c764f974b04 /java/src | |
| parent | 41f9ecec24e4a83ff1871c6333174d7e69a6c2a2 (diff) | |
| parent | 74b89db8a4524cd702a46bc975a6af0e4fcfc7e4 (diff) | |
| download | latinime-c132476af074aea8cd58f734140ff9b50698df2b.tar.gz latinime-c132476af074aea8cd58f734140ff9b50698df2b.tar.xz latinime-c132476af074aea8cd58f734140ff9b50698df2b.zip | |
am 74b89db8: Merge "Fix key label padding" into jb-mr1-dev
* commit '74b89db8a4524cd702a46bc975a6af0e4fcfc7e4':
Fix key label padding
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/KeyboardView.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardView.java b/java/src/com/android/inputmethod/keyboard/KeyboardView.java index 97912f0f3..4e47eab26 100644 --- a/java/src/com/android/inputmethod/keyboard/KeyboardView.java +++ b/java/src/com/android/inputmethod/keyboard/KeyboardView.java @@ -221,13 +221,13 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy { mKeyDrawParams = new KeyDrawParams(keyboardViewAttr, keyAttr); mKeyPreviewDrawParams = new KeyPreviewDrawParams(keyboardViewAttr, keyAttr); mDelayAfterPreview = mKeyPreviewDrawParams.mLingerTimeout; - mKeyLabelHorizontalPadding = keyAttr.getDimensionPixelOffset( + mKeyLabelHorizontalPadding = keyboardViewAttr.getDimensionPixelOffset( R.styleable.KeyboardView_keyLabelHorizontalPadding, 0); - mKeyHintLetterPadding = keyAttr.getDimension( + mKeyHintLetterPadding = keyboardViewAttr.getDimension( R.styleable.KeyboardView_keyHintLetterPadding, 0); - mKeyPopupHintLetterPadding = keyAttr.getDimension( + mKeyPopupHintLetterPadding = keyboardViewAttr.getDimension( R.styleable.KeyboardView_keyPopupHintLetterPadding, 0); - mKeyShiftedLetterHintPadding = keyAttr.getDimension( + mKeyShiftedLetterHintPadding = keyboardViewAttr.getDimension( R.styleable.KeyboardView_keyShiftedLetterHintPadding, 0); mKeyPreviewLayoutId = keyboardViewAttr.getResourceId( R.styleable.KeyboardView_keyPreviewLayout, 0); |