commit 9380e641884aabbb07f03ec1c28f92deb33884af
author Jean Chalard <jchalard@google.com> Wed Nov 21 21:49:24 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 21 21:49:25 2012 -0800
tree 77ec95de213374ef9f89b1be7f43597d9eaec1cf
parent befc1a05c993106fb6657bb9e188879dafe401ec
parent d5f53710c572a384059b8e12d036cefccda98fc3

Merge "Update dictionaries and fix mistakes"

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();