diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2013-08-26 21:03:46 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-08-26 21:03:46 -0700 |
| commit | 8110e347515d4605e000c7fcea0f98832218518a (patch) | |
| tree | 453ebee8e93ca5dd03cdd72cb14a95e58bfb863a /java/src | |
| parent | 5609b4f645ea9863eaaf47b95f2aabdc3a41bed5 (diff) | |
| parent | 1f4612fc5434e5b223d6f6c1ef77fb5fae0d32ee (diff) | |
| download | latinime-8110e347515d4605e000c7fcea0f98832218518a.tar.gz latinime-8110e347515d4605e000c7fcea0f98832218518a.tar.xz latinime-8110e347515d4605e000c7fcea0f98832218518a.zip | |
am 1f4612fc: Remove obsolete theme resources
* commit '1f4612fc5434e5b223d6f6c1ef77fb5fae0d32ee':
Remove obsolete theme resources
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java index 4313467cb..ff2692d81 100644 --- a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java +++ b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java @@ -58,12 +58,8 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions { } private static final KeyboardTheme[] KEYBOARD_THEMES = { - new KeyboardTheme(0, R.style.KeyboardTheme), - new KeyboardTheme(1, R.style.KeyboardTheme_HighContrast), - new KeyboardTheme(6, R.style.KeyboardTheme_Stone), - new KeyboardTheme(7, R.style.KeyboardTheme_Stone_Bold), - new KeyboardTheme(8, R.style.KeyboardTheme_Gingerbread), new KeyboardTheme(5, R.style.KeyboardTheme_IceCreamSandwich), + new KeyboardTheme(8, R.style.KeyboardTheme_Gingerbread), }; private SubtypeSwitcher mSubtypeSwitcher; @@ -121,8 +117,9 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions { } catch (NumberFormatException e) { // Format error, keyboard theme is default to 0. } - Log.w(TAG, "Illegal keyboard theme in preference: " + themeIndex + ", default to 0"); - return KEYBOARD_THEMES[0]; + Log.w(TAG, "Illegal keyboard theme in preference: " + themeIndex + ", default to " + + defaultIndex); + return KEYBOARD_THEMES[Integer.valueOf(defaultIndex)]; } private void setContextThemeWrapper(final Context context, final KeyboardTheme keyboardTheme) { |