diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-08-13 05:33:24 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-08-13 05:33:24 +0000 |
| commit | 67f1b28578dc1d29491abadd594e00f31c5ded23 (patch) | |
| tree | e4ca7de4998e617ff08ea4f7ff840a338bcaa0e3 /java/src | |
| parent | 4146db552fa2f38b91f404c3a59a89129e6d8af0 (diff) | |
| parent | 4ac551d189054ec58dd8aeb4754ee3071dc798d2 (diff) | |
| download | latinime-67f1b28578dc1d29491abadd594e00f31c5ded23.tar.gz latinime-67f1b28578dc1d29491abadd594e00f31c5ded23.tar.xz latinime-67f1b28578dc1d29491abadd594e00f31c5ded23.zip | |
am 4ac551d1: am 7edc27f1: am 8f3e778a: Revert "Remove reference of VERSION_CODES.CUR_DEVELOPMENT"
* commit '4ac551d189054ec58dd8aeb4754ee3071dc798d2':
Revert "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, 8 insertions, 5 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardTheme.java b/java/src/com/android/inputmethod/keyboard/KeyboardTheme.java index 135423393..4c2e0dd1d 100644 --- a/java/src/com/android/inputmethod/keyboard/KeyboardTheme.java +++ b/java/src/com/android/inputmethod/keyboard/KeyboardTheme.java @@ -38,9 +38,6 @@ 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. @@ -50,7 +47,8 @@ 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. - VERSION_CODES_LXX), + // TODO: Update this constant once the *next* version becomes available. + VERSION_CODES.CUR_DEVELOPMENT), new KeyboardTheme(THEME_ID_LXX_DARK, R.style.KeyboardTheme_LXX_Dark, VERSION_CODES.BASE), }; @@ -102,7 +100,12 @@ public final class KeyboardTheme implements Comparable<KeyboardTheme> { } private static int getSdkVersion() { - return Build.VERSION.SDK_INT; + 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; } @UsedForTesting |