commit dc52a5621aa54ed1b312b495ed1f62e95f0764b5
author Ken Wakasa <kwakasa@google.com> Fri Sep 16 16:26:13 2011 +0900
committer Ken Wakasa <kwakasa@google.com> Fri Sep 16 16:26:13 2011 +0900
tree 055f9efdb419b108f542be92265190f2326fa984
parent 70ae4efd64c4436afaf940a455f93ec61af0a741

Use the correct theme on ICS

bug: 5329939
Change-Id: Ia139813b83eefe53863cae9cbe46b8b3a940e0df

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 236a37d..309f03d 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
@@ -182,7 +182,8 @@
 
     private static int getKeyboardThemeIndex(Context context, SharedPreferences prefs) {
         final String defaultThemeId = context.getString(R.string.config_default_keyboard_theme_id);
-        final String themeId = prefs.getString(PREF_KEYBOARD_LAYOUT, defaultThemeId);
+        final String themeId = Settings.ENABLE_EXPERIMENTAL_SETTINGS
+                ? prefs.getString(PREF_KEYBOARD_LAYOUT, defaultThemeId) : defaultThemeId;
         try {
             final int themeIndex = Integer.valueOf(themeId);
             if (themeIndex >= 0 && themeIndex < KEYBOARD_THEMES.length)