From ad2dfa7697ecc4b775a1fd55ade1697c3322215a Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Mon, 3 Oct 2011 12:34:36 +0900
Subject: [PATCH] Fix keyboard theme parsing

This is a followup of I13b9997e.

Change-Id: I4c10fbc8b250c3bad72e38d46089684a839bdd5f
---
 java/res/values/themes-stone-bold.xml                          | 2 +-
 .../android/inputmethod/keyboard/internal/KeyboardBuilder.java | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/java/res/values/themes-stone-bold.xml b/java/res/values/themes-stone-bold.xml
index fdf9c51f5..532a2985e 100644
--- a/java/res/values/themes-stone-bold.xml
+++ b/java/res/values/themes-stone-bold.xml
@@ -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>
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardBuilder.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardBuilder.java
index 3cdde09a9..ec358722f 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardBuilder.java
+++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardBuilder.java
@@ -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) {