diff options
| author |   Satoshi Kataoka <satok@google.com> | 2011-10-03 00:51:27 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2011-10-03 00:51:27 -0700 |
| commit | 782b05fa7444bacf85c56172078327491b625e60 (patch) | |
| tree | c04c857b18c58910e71f59e5d1ae575110bc93dc /java/src | |
| parent | c132e93592a1bb108c0193f394ebffd15ae9e0bd (diff) | |
| parent | 21ffb08a73d3686abfa43f8e4eeae1afc09284d7 (diff) | |
| download | latinime-782b05fa7444bacf85c56172078327491b625e60.tar.gz latinime-782b05fa7444bacf85c56172078327491b625e60.tar.xz latinime-782b05fa7444bacf85c56172078327491b625e60.zip | |
am 21ffb08a: Merge "Fix obtainStyledAttribute not to look for default"
* commit '21ffb08a73d3686abfa43f8e4eeae1afc09284d7':
Fix obtainStyledAttribute not to look for default
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/internal/KeyboardBuilder.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardBuilder.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardBuilder.java index ec358722f..e723dc19a 100644 --- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardBuilder.java +++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardBuilder.java @@ -259,9 +259,10 @@ public class KeyboardBuilder<KP extends KeyboardParams> { params.mTouchPositionCorrectionRadii = null; final TypedArray a = context.obtainStyledAttributes( - null, R.styleable.Keyboard, R.attr.keyboardStyle, R.style.Keyboard); + null, R.styleable.Keyboard, R.attr.keyboardStyle, 0); params.mThemeId = a.getInt(R.styleable.Keyboard_themeId, 0); final int resourceId = a.getResourceId(R.styleable.Keyboard_touchPositionCorrectionData, 0); + a.recycle(); if (resourceId == 0) { if (LatinImeLogger.sDBG) throw new RuntimeException("touchPositionCorrectionData is not defined"); @@ -269,7 +270,6 @@ public class KeyboardBuilder<KP extends KeyboardParams> { } final String[] data = context.getResources().getStringArray(resourceId); - a.recycle(); final int dataLength = data.length; if (dataLength % TOUCH_POSITION_CORRECTION_RECORD_SIZE != 0) { if (LatinImeLogger.sDBG) |