Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7edc27f1 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android Git Automerger
Browse files

am 8f3e778a: Revert "Remove reference of VERSION_CODES.CUR_DEVELOPMENT" 

* commit '8f3e778a':
  Revert "Remove reference of VERSION_CODES.CUR_DEVELOPMENT"
parents a70542a5 8f3e778a

java/src/com/android/inputmethod/keyboard/KeyboardTheme.java

+8 −5
Original line number Diff line number Diff line
@@ -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

tests/src/com/android/inputmethod/keyboard/KeyboardThemeTests.java

+3 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import static com.android.inputmethod.keyboard.KeyboardTheme.THEME_ID_ICS; 
import static com.android.inputmethod.keyboard.KeyboardTheme.THEME_ID_KLP;

import static com.android.inputmethod.keyboard.KeyboardTheme.THEME_ID_LXX_DARK;

import static com.android.inputmethod.keyboard.KeyboardTheme.THEME_ID_LXX_LIGHT;

import static com.android.inputmethod.keyboard.KeyboardTheme.VERSION_CODES_LXX;



import android.content.SharedPreferences;

import android.os.Build.VERSION_CODES;
@@ -32,6 +31,9 @@ import android.test.suitebuilder.annotation.SmallTest; 
public class KeyboardThemeTests extends AndroidTestCase {

    private SharedPreferences mPrefs;



    // TODO: Remove this constant once the *next* version becomes available.

    private static final int VERSION_CODES_LXX = VERSION_CODES.CUR_DEVELOPMENT;



    private static final int THEME_ID_NULL = -1;

    private static final int THEME_ID_UNKNOWN = -2;

    private static final int THEME_ID_ILLEGAL = -3;