From dc52a5621aa54ed1b312b495ed1f62e95f0764b5 Mon Sep 17 00:00:00 2001
From: Ken Wakasa <kwakasa@google.com>
Date: Fri, 16 Sep 2011 16:26:13 +0900
Subject: [PATCH] Use the correct theme on ICS
bug: 5329939
Change-Id: Ia139813b83eefe53863cae9cbe46b8b3a940e0df
---
.../src/com/android/inputmethod/keyboard/KeyboardSwitcher.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
index 236a37d5c6..309f03d7b7 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
@@ -182,7 +182,8 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
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)
--
GitLab