nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am cc02aa8a: Fix missing TypedArray.recycle calls 

* commit 'cc02aa8af35b85cb564503c7b54e1eae6a6b6169':
  Fix missing TypedArray.recycle calls
main
Tadashi G. Takaoka 2011-10-18 21:15:19 -07:00 committed by Android Git Automerger
parent 5304d6968b cc02aa8af3
commit a1b6e32cf4
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
java/src/com/android/inputmethod/keyboard/LatinKeyboard.java
View File

@ -38,7 +38,6 @@ import com.android.inputmethod.latin.R;
import com.android.inputmethod.latin.SubtypeSwitcher; import com.android.inputmethod.latin.SubtypeSwitcher;
import com.android.inputmethod.latin.Utils; import com.android.inputmethod.latin.Utils;
import java.lang.ref.SoftReference;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.Locale; import java.util.Locale;
@ -329,10 +328,12 @@ public class LatinKeyboard extends Keyboard {
Math.max(0, Math.min(y, mOccupiedHeight - 1))); Math.max(0, Math.min(y, mOccupiedHeight - 1)));
} }
private static final int[] ATTR_TEXT_SIZE = { android.R.attr.textSize };
public static int getTextSizeFromTheme(Theme theme, int style, int defValue) { public static int getTextSizeFromTheme(Theme theme, int style, int defValue) {
TypedArray array = theme.obtainStyledAttributes( final TypedArray a = theme.obtainStyledAttributes(style, ATTR_TEXT_SIZE);
style, new int[] { android.R.attr.textSize }); final int textSize = a.getDimensionPixelSize(a.getResourceId(0, 0), defValue);
int textSize = array.getDimensionPixelSize(array.getResourceId(0, 0), defValue); a.recycle();
return textSize; return textSize;
} }
} }

5
java/src/com/android/inputmethod/keyboard/internal/KeyboardBuilder.java
View File

@ -323,7 +323,10 @@ public class KeyboardBuilder<KP extends KeyboardParams> {
if (TAG_KEYBOARD.equals(tag)) { if (TAG_KEYBOARD.equals(tag)) {
final TypedArray keyboardAttr = res.obtainAttributes(Xml.asAttributeSet(parser), final TypedArray keyboardAttr = res.obtainAttributes(Xml.asAttributeSet(parser),
R.styleable.Keyboard); R.styleable.Keyboard);
return keyboardAttr.getString(R.styleable.Keyboard_keyboardLocale); final String locale = keyboardAttr.getString(
R.styleable.Keyboard_keyboardLocale);
keyboardAttr.recycle();
return locale;
} else { } else {
throw new IllegalStartTag(parser, TAG_KEYBOARD); throw new IllegalStartTag(parser, TAG_KEYBOARD);
} }