aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2012-08-31 03:58:21 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-08-31 03:58:21 -0700
commit74b89db8a4524cd702a46bc975a6af0e4fcfc7e4 (patch)
tree15ce4e1a74e3c0f9d857c73741149c764f974b04 /java/src
parent9d05f36b77412e1a2e5e46002b851dd82f036232 (diff)
parent36b5f4aae2c91c537395e0d6effb6e235d32fd2c (diff)
downloadlatinime-74b89db8a4524cd702a46bc975a6af0e4fcfc7e4.tar.gz
latinime-74b89db8a4524cd702a46bc975a6af0e4fcfc7e4.tar.xz
latinime-74b89db8a4524cd702a46bc975a6af0e4fcfc7e4.zip
Merge "Fix key label padding" into jb-mr1-dev
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/keyboard/KeyboardView.java8
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);