commit befc1a05c993106fb6657bb9e188879dafe401ec
author Tadashi G. Takaoka <takaoka@google.com> Thu Nov 22 11:41:53 2012 +0900
committer Tadashi G. Takaoka <takaoka@google.com> Thu Nov 22 11:41:53 2012 +0900
tree 4736a5f910a5ea5753d903f7b1f9d04c942e7e47
parent 40f7b43b3f0f2845cc005a901c911637c8c591ca

Fix keyboard theme initializing bug

Change-Id: If7037f3e0606ee34d1a6739cc39da23de18cc35c

java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java

diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
index c2e31ee..c1c105e 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
@@ -125,7 +125,7 @@
     }
 
     private void setContextThemeWrapper(Context context, KeyboardTheme keyboardTheme) {
-        if (mKeyboardTheme.mThemeId != keyboardTheme.mThemeId) {
+        if (mThemeContext == null || mKeyboardTheme.mThemeId != keyboardTheme.mThemeId) {
             mKeyboardTheme = keyboardTheme;
             mThemeContext = new ContextThemeWrapper(context, keyboardTheme.mStyleId);
             KeyboardLayoutSet.clearKeyboardCache();