diff options
| -rw-r--r-- | java/res/xml/prefs_for_debug.xml | 2 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/java/res/xml/prefs_for_debug.xml b/java/res/xml/prefs_for_debug.xml index 2dad17148..80613a56f 100644 --- a/java/res/xml/prefs_for_debug.xml +++ b/java/res/xml/prefs_for_debug.xml @@ -27,7 +27,7 @@ /> <ListPreference - android:key="pref_keyboard_layout_20100902" + android:key="pref_keyboard_layout_20110916" android:title="@string/keyboard_layout" android:persistent="true" android:entryValues="@array/keyboard_layout_modes_values" diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java index 309f03d7b..2d123699e 100644 --- a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java +++ b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java @@ -49,7 +49,7 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha private static final boolean DEBUG_CACHE = LatinImeLogger.sDBG; public static final boolean DEBUG_STATE = false; - public static final String PREF_KEYBOARD_LAYOUT = "pref_keyboard_layout_20100902"; + public static final String PREF_KEYBOARD_LAYOUT = "pref_keyboard_layout_20110916"; private static final int[] KEYBOARD_THEMES = { R.style.KeyboardTheme, R.style.KeyboardTheme_HighContrast, @@ -182,8 +182,7 @@ 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 = Settings.ENABLE_EXPERIMENTAL_SETTINGS - ? prefs.getString(PREF_KEYBOARD_LAYOUT, defaultThemeId) : defaultThemeId; + final String themeId = prefs.getString(PREF_KEYBOARD_LAYOUT, defaultThemeId); try { final int themeIndex = Integer.valueOf(themeId); if (themeIndex >= 0 && themeIndex < KEYBOARD_THEMES.length) |