diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-08-12 23:13:18 +0900 |
|---|---|---|
| committer | Tadashi G. Takaoka <takaoka@google.com> | 2014-08-12 23:13:18 +0900 |
| commit | 5380acfd04342b35289599f0bda3eaae1ddac642 (patch) | |
| tree | 957f9ef262f2e546019c97eef717897c119ae927 /java/src | |
| parent | 89e8cba6aed19c577c96aa9b4e56dd6ddd0182c7 (diff) | |
| download | latinime-5380acfd04342b35289599f0bda3eaae1ddac642.tar.gz latinime-5380acfd04342b35289599f0bda3eaae1ddac642.tar.xz latinime-5380acfd04342b35289599f0bda3eaae1ddac642.zip | |
Remove reference of VERSION_CODES.CUR_DEVELOPMENT
Bug: 13888366
Change-Id: I0b829e2cf9a11c694cf01b6f02753233c9c85105
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/KeyboardTheme.java | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardTheme.java b/java/src/com/android/inputmethod/keyboard/KeyboardTheme.java index 4c2e0dd1d..135423393 100644 --- a/java/src/com/android/inputmethod/keyboard/KeyboardTheme.java +++ b/java/src/com/android/inputmethod/keyboard/KeyboardTheme.java @@ -38,6 +38,9 @@ public final class KeyboardTheme implements Comparable<KeyboardTheme> { public static final int THEME_ID_LXX_DARK = 4; public static final int DEFAULT_THEME_ID = THEME_ID_KLP; + // TODO: Update this constant once the *next* version becomes available. + public static final int VERSION_CODES_LXX = 21; + private static final KeyboardTheme[] KEYBOARD_THEMES = { new KeyboardTheme(THEME_ID_ICS, R.style.KeyboardTheme_ICS, // This has never been selected because we support ICS or later. @@ -47,8 +50,7 @@ public final class KeyboardTheme implements Comparable<KeyboardTheme> { VERSION_CODES.ICE_CREAM_SANDWICH), new KeyboardTheme(THEME_ID_LXX_LIGHT, R.style.KeyboardTheme_LXX_Light, // Default theme for LXX. - // TODO: Update this constant once the *next* version becomes available. - VERSION_CODES.CUR_DEVELOPMENT), + VERSION_CODES_LXX), new KeyboardTheme(THEME_ID_LXX_DARK, R.style.KeyboardTheme_LXX_Dark, VERSION_CODES.BASE), }; @@ -100,12 +102,7 @@ public final class KeyboardTheme implements Comparable<KeyboardTheme> { } private static int getSdkVersion() { - final int sdkVersion = Build.VERSION.SDK_INT; - // TODO: Consider to remove this check once the *next* version becomes available. - if (sdkVersion > VERSION_CODES.KITKAT) { - return VERSION_CODES.CUR_DEVELOPMENT; - } - return sdkVersion; + return Build.VERSION.SDK_INT; } @UsedForTesting |