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

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

am 5380acfd: Remove reference of VERSION_CODES.CUR_DEVELOPMENT 

* commit '5380acfd':
  Remove reference of VERSION_CODES.CUR_DEVELOPMENT
parents 6a5cba26 5380acfd

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

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

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

+1 −3
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 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;
@@ -31,9 +32,6 @@ 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;