diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2011-09-16 06:08:37 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2011-09-16 06:08:37 -0700 |
| commit | bc9c9995a04e92c9b4092cf7e8ffd1adcbdce376 (patch) | |
| tree | 9ca40fc2e22a58591c30ce4ffc5b1b6289f0c530 /java/src/com | |
| parent | 9e9ce6bb93d6adfb5f051a026306c1d5bc8b92d4 (diff) | |
| parent | 2d9722e46c774d51c834c3a8b11261a2a22e09d3 (diff) | |
| download | latinime-bc9c9995a04e92c9b4092cf7e8ffd1adcbdce376.tar.gz latinime-bc9c9995a04e92c9b4092cf7e8ffd1adcbdce376.tar.xz latinime-bc9c9995a04e92c9b4092cf7e8ffd1adcbdce376.zip | |
am 2d9722e4: Update the theme pref key.
* commit '2d9722e46c774d51c834c3a8b11261a2a22e09d3':
Update the theme pref key.
Diffstat (limited to 'java/src/com')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java | 5 |
1 files changed, 2 insertions, 3 deletions
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) |