diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-08-12 15:02:59 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-08-12 15:02:59 +0000 |
| commit | 89a214544853f16ef5d979bd1503d370ea5ff39d (patch) | |
| tree | 437fd23029ec124e2036ae212be9bc8fd6b634a0 /java/src | |
| parent | 7ad1fb2a43511557a8bab8ac0973863ad26eee4d (diff) | |
| parent | a70542a5ef2c7f4d5cfe62150ed17be3776904c5 (diff) | |
| download | latinime-89a214544853f16ef5d979bd1503d370ea5ff39d.tar.gz latinime-89a214544853f16ef5d979bd1503d370ea5ff39d.tar.xz latinime-89a214544853f16ef5d979bd1503d370ea5ff39d.zip | |
am a70542a5: am 5380acfd: Remove reference of VERSION_CODES.CUR_DEVELOPMENT
* commit 'a70542a5ef2c7f4d5cfe62150ed17be3776904c5':
Remove reference of VERSION_CODES.CUR_DEVELOPMENT
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 |