From 8f3e778a21ff2c8855fb0014116eda9eec7f2b5d Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Wed, 13 Aug 2014 03:59:37 +0000
Subject: Revert "Remove reference of VERSION_CODES.CUR_DEVELOPMENT"

This reverts commit 5380acfd04342b35289599f0bda3eaae1ddac642.

Bug: 13888366
Change-Id: Iae0fb6798cef9d59c9de3790123f6acaf8b2746b
---
 .../src/com/android/inputmethod/keyboard/KeyboardTheme.java | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'java/src')

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
-- 
cgit v1.2.3-83-g751a