commit 74b89db8a4524cd702a46bc975a6af0e4fcfc7e4
author Tadashi G. Takaoka <takaoka@google.com> Fri Aug 31 03:58:21 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 31 03:58:21 2012 -0700
tree 15ce4e1a74e3c0f9d857c73741149c764f974b04
parent 9d05f36b77412e1a2e5e46002b851dd82f036232
parent 36b5f4aae2c91c537395e0d6effb6e235d32fd2c

Merge "Fix key label padding" into jb-mr1-dev

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

diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardView.java b/java/src/com/android/inputmethod/keyboard/KeyboardView.java
index 97912f0..4e47eab 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardView.java
@@ -221,13 +221,13 @@
         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);