diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2011-11-07 19:14:21 -0800 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2011-11-07 19:14:21 -0800 |
| commit | 0e39e820ce49b5fc2f8a309c3f64e5b0fefbea48 (patch) | |
| tree | ad6ec69bb61dc0ff21c5c707265b5a07fa6d2622 /java/src | |
| parent | 0a75373f4187d2db036757c2c2bcaba42301fd22 (diff) | |
| parent | 549863a7c50c8ee2e23c654ec60ee47c69f97a9f (diff) | |
| download | latinime-0e39e820ce49b5fc2f8a309c3f64e5b0fefbea48.tar.gz latinime-0e39e820ce49b5fc2f8a309c3f64e5b0fefbea48.tar.xz latinime-0e39e820ce49b5fc2f8a309c3f64e5b0fefbea48.zip | |
Merge "Fix referring wrong TypedArray (DO NOT MERGE)" into ics-mr1
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(); |