diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2011-11-08 03:16:41 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2011-11-08 03:16:41 +0000 |
| commit | 7c974e093b8d42ec65ebc00f070ee823626192bf (patch) | |
| tree | ad6ec69bb61dc0ff21c5c707265b5a07fa6d2622 /java/src | |
| parent | fc687af0692e602edee605aa79a571cae33ca681 (diff) | |
| parent | 0e39e820ce49b5fc2f8a309c3f64e5b0fefbea48 (diff) | |
| download | latinime-7c974e093b8d42ec65ebc00f070ee823626192bf.tar.gz latinime-7c974e093b8d42ec65ebc00f070ee823626192bf.tar.xz latinime-7c974e093b8d42ec65ebc00f070ee823626192bf.zip | |
am 0e39e820: Merge "Fix referring wrong TypedArray (DO NOT MERGE)" into ics-mr1
* commit '0e39e820ce49b5fc2f8a309c3f64e5b0fefbea48':
Fix referring wrong TypedArray (DO NOT MERGE)
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(); |