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

Fix keyboard theme parsing

Browse source 
This is a followup of I13b9997e.

Change-Id: I4c10fbc8b250c3bad72e38d46089684a839bdd5f
This commit is contained in:
Tadashi G. Takaoka 2011-10-03 12:34:36 +09:00
parent aef4f906ff
commit ad2dfa7697
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
java/res/values/themes-stone-bold.xml
View file

@ -16,7 +16,7 @@
<resources> <resources>
<style name="KeyboardTheme.Stone.Bold" parent="KeyboardIcons.Black"> <style name="KeyboardTheme.Stone.Bold" parent="KeyboardIcons.Black">
<item name="keyboardStyle">@style/Keyboard.Stone</item> <item name="keyboardStyle">@style/Keyboard.Stone.Bold</item>
<item name="latinKeyboardStyle">@style/LatinKeyboard.Stone</item> <item name="latinKeyboardStyle">@style/LatinKeyboard.Stone</item>
<item name="keyboardViewStyle">@style/KeyboardView.Stone.Bold</item> <item name="keyboardViewStyle">@style/KeyboardView.Stone.Bold</item>
<item name="miniKeyboardStyle">@style/MiniKeyboard.Stone</item> <item name="miniKeyboardStyle">@style/MiniKeyboard.Stone</item>

3
java/src/com/android/inputmethod/keyboard/internal/KeyboardBuilder.java
View file

@ -258,7 +258,8 @@ public class KeyboardBuilder<KP extends KeyboardParams> {
params.mTouchPositionCorrectionYs = null; params.mTouchPositionCorrectionYs = null;
params.mTouchPositionCorrectionRadii = null; params.mTouchPositionCorrectionRadii = null;
final TypedArray a = context.obtainStyledAttributes(R.styleable.Keyboard); final TypedArray a = context.obtainStyledAttributes(
null, R.styleable.Keyboard, R.attr.keyboardStyle, R.style.Keyboard);
params.mThemeId = a.getInt(R.styleable.Keyboard_themeId, 0); params.mThemeId = a.getInt(R.styleable.Keyboard_themeId, 0);
final int resourceId = a.getResourceId(R.styleable.Keyboard_touchPositionCorrectionData, 0); final int resourceId = a.getResourceId(R.styleable.Keyboard_touchPositionCorrectionData, 0);
if (resourceId == 0) { if (resourceId == 0) {