Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad2dfa76 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Fix keyboard theme parsing 

This is a followup of I13b9997e.

Change-Id: I4c10fbc8b250c3bad72e38d46089684a839bdd5f
parent aef4f906

java/res/values/themes-stone-bold.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


<resources>

    <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="keyboardViewStyle">@style/KeyboardView.Stone.Bold</item>

        <item name="miniKeyboardStyle">@style/MiniKeyboard.Stone</item>

java/src/com/android/inputmethod/keyboard/internal/KeyboardBuilder.java

+2 −1
Original line number Diff line number Diff line
@@ -258,7 +258,8 @@ public class KeyboardBuilder<KP extends KeyboardParams> { 
        params.mTouchPositionCorrectionYs = 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);

        final int resourceId = a.getResourceId(R.styleable.Keyboard_touchPositionCorrectionData, 0);

        if (resourceId == 0) {