nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 60e4997e: Merge "Use the correct theme on ICS" 

* commit '60e4997eab0823f87f5fa59ac5c9a3221f5cc4d4':
  Use the correct theme on ICS
main
Ken Wakasa 2011-09-16 01:18:12 -07:00 committed by Android Git Automerger
parent aacaccea87 60e4997eab
commit 9e9ce6bb93
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
View File

@ -182,7 +182,8 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
private static int getKeyboardThemeIndex(Context context, SharedPreferences prefs) { private static int getKeyboardThemeIndex(Context context, SharedPreferences prefs) {
final String defaultThemeId = context.getString(R.string.config_default_keyboard_theme_id); 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 { try {
final int themeIndex = Integer.valueOf(themeId); final int themeIndex = Integer.valueOf(themeId);
if (themeIndex >= 0 && themeIndex < KEYBOARD_THEMES.length) if (themeIndex >= 0 && themeIndex < KEYBOARD_THEMES.length)