aboutsummaryrefslogtreecommitdiffstats
path: root/tests/src/com/android
diff options
context:
space:
mode:
authorYohei Yukawa <yukawa@google.com>2014-10-22 00:07:23 +0900
committerYohei Yukawa <yukawa@google.com>2014-10-22 01:29:58 +0900
commit66d30a4b226556f2f58b3701c6bc1974384486db (patch)
treebdedc54917f2e68951e267ecd03f3ca753795856 /tests/src/com/android
parent46a007261fcbfbe887e22ecdf16307f95b1e4024 (diff)
downloadlatinime-66d30a4b226556f2f58b3701c6bc1974384486db.tar.gz
latinime-66d30a4b226556f2f58b3701c6bc1974384486db.tar.xz
latinime-66d30a4b226556f2f58b3701c6bc1974384486db.zip
Remove BuildCompatUtils.VERSION_CODES_LXX
Finally it is turned out to be a XXL-size Lollipop. Change-Id: Icbd22506be9de514eba287cdd8d97fbfd070ac09
Diffstat (limited to 'tests/src/com/android')
-rw-r--r--tests/src/com/android/inputmethod/keyboard/KeyboardThemeTests.java16
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/src/com/android/inputmethod/keyboard/KeyboardThemeTests.java b/tests/src/com/android/inputmethod/keyboard/KeyboardThemeTests.java
index d642a1073..33e88c13b 100644
--- a/tests/src/com/android/inputmethod/keyboard/KeyboardThemeTests.java
+++ b/tests/src/com/android/inputmethod/keyboard/KeyboardThemeTests.java
@@ -16,13 +16,13 @@
package com.android.inputmethod.keyboard;
-import static com.android.inputmethod.compat.BuildCompatUtils.VERSION_CODES_LXX;
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 android.content.SharedPreferences;
+import android.os.Build;
import android.os.Build.VERSION_CODES;
import android.preference.PreferenceManager;
import android.test.AndroidTestCase;
@@ -131,7 +131,7 @@ public class KeyboardThemeTests extends AndroidTestCase {
}
public void testKeyboardThemePreferenceOnLxx() {
- assertKeyboardThemePreferenceOnLxx(VERSION_CODES_LXX);
+ assertKeyboardThemePreferenceOnLxx(Build.VERSION_CODES.LOLLIPOP);
}
/*
@@ -184,7 +184,7 @@ public class KeyboardThemeTests extends AndroidTestCase {
}
public void testDefaultKeyboardThemeOnLxx() {
- assertDefaultKeyboardThemeOnLxx(VERSION_CODES_LXX);
+ assertDefaultKeyboardThemeOnLxx(Build.VERSION_CODES.LOLLIPOP);
}
/*
@@ -251,7 +251,7 @@ public class KeyboardThemeTests extends AndroidTestCase {
// Upgrading keyboard on L.
public void testUpgradeKeyboardToLxxOnLxx() {
- assertUpgradeKeyboardToLxxOnLxx(VERSION_CODES_LXX);
+ assertUpgradeKeyboardToLxxOnLxx(Build.VERSION_CODES.LOLLIPOP);
}
/*
@@ -304,7 +304,7 @@ public class KeyboardThemeTests extends AndroidTestCase {
private void assertUpgradePlatformToLxxFrom(final int oldSdkVersion) {
// Forced to switch to LXX theme.
- final int newSdkVersion = VERSION_CODES_LXX;
+ final int newSdkVersion = Build.VERSION_CODES.LOLLIPOP;
assertUpgradePlatformFromTo(
oldSdkVersion, newSdkVersion, THEME_ID_NULL, THEME_ID_LXX_LIGHT);
assertUpgradePlatformFromTo(
@@ -329,8 +329,8 @@ public class KeyboardThemeTests extends AndroidTestCase {
// Update platform from L to L.
public void testUpgradePlatformToLxxFromLxx() {
- final int oldSdkVersion = VERSION_CODES_LXX;
- final int newSdkVersion = VERSION_CODES_LXX;
+ final int oldSdkVersion = Build.VERSION_CODES.LOLLIPOP;
+ final int newSdkVersion = Build.VERSION_CODES.LOLLIPOP;
assertUpgradePlatformFromTo(
oldSdkVersion, newSdkVersion, THEME_ID_NULL, THEME_ID_LXX_LIGHT);
assertUpgradePlatformFromTo(
@@ -419,7 +419,7 @@ public class KeyboardThemeTests extends AndroidTestCase {
setKeyboardThemePreference(KeyboardTheme.KLP_KEYBOARD_THEME_KEY, THEME_ID_NULL);
setKeyboardThemePreference(KeyboardTheme.LXX_KEYBOARD_THEME_KEY, THEME_ID_NULL);
- final int sdkVersion = VERSION_CODES_LXX;
+ final int sdkVersion = Build.VERSION_CODES.LOLLIPOP;
final String oldPrefKey = KeyboardTheme.getPreferenceKey(sdkVersion);
setKeyboardThemePreference(oldPrefKey, THEME_ID_LXX_DARK);