diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2011-09-16 01:18:12 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2011-09-16 01:18:12 -0700 |
| commit | 9e9ce6bb93d6adfb5f051a026306c1d5bc8b92d4 (patch) | |
| tree | 395f74c8823f3f6d2a3e86fa5554278afc002cbe /java/src/com/android/inputmethod | |
| parent | aacaccea8798a6b119a9b03b0f5943442f2aa031 (diff) | |
| parent | 60e4997eab0823f87f5fa59ac5c9a3221f5cc4d4 (diff) | |
| download | latinime-9e9ce6bb93d6adfb5f051a026306c1d5bc8b92d4.tar.gz latinime-9e9ce6bb93d6adfb5f051a026306c1d5bc8b92d4.tar.xz latinime-9e9ce6bb93d6adfb5f051a026306c1d5bc8b92d4.zip | |
am 60e4997e: Merge "Use the correct theme on ICS"
* commit '60e4997eab0823f87f5fa59ac5c9a3221f5cc4d4':
Use the correct theme on ICS
Diffstat (limited to 'java/src/com/android/inputmethod')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java index 236a37d5c..309f03d7b 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) |