diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2011-11-04 10:48:39 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2011-11-04 10:48:39 +0000 |
| commit | c30ea0910e1f8e3c32ed2e314c584bced9321474 (patch) | |
| tree | 076f114bd996a7b69a022d3a26c621ed5e07804c /java/src | |
| parent | d2a18cbdedd813f82089a844b683afe068e47746 (diff) | |
| parent | 6c1c546a98d45c202b549c0710d75680214635b0 (diff) | |
| download | latinime-c30ea0910e1f8e3c32ed2e314c584bced9321474.tar.gz latinime-c30ea0910e1f8e3c32ed2e314c584bced9321474.tar.xz latinime-c30ea0910e1f8e3c32ed2e314c584bced9321474.zip | |
am 6c1c546a: Merge "Fix referring wrong TypedArray"
* commit '6c1c546a98d45c202b549c0710d75680214635b0':
Fix referring wrong TypedArray
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/internal/KeyboardBuilder.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardBuilder.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardBuilder.java index c2e96f877..de64639b0 100644 --- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardBuilder.java +++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardBuilder.java @@ -169,7 +169,7 @@ public class KeyboardBuilder<KP extends KeyboardParams> { keyboardAttr.recycle(); TypedArray keyAttr = res.obtainAttributes(Xml.asAttributeSet(parser), R.styleable.Keyboard_Key); - mDefaultKeyWidth = KeyboardBuilder.getDimensionOrFraction(keyboardAttr, + mDefaultKeyWidth = KeyboardBuilder.getDimensionOrFraction(keyAttr, R.styleable.Keyboard_Key_keyWidth, params.mBaseWidth, params.mDefaultKeyWidth); keyAttr.recycle(); |