diff --git a/java/res/values/config-common.xml b/java/res/values/config-common.xml
index 3fe4b947c..1962c0d45 100644
--- a/java/res/values/config-common.xml
+++ b/java/res/values/config-common.xml
@@ -24,9 +24,6 @@
at input history to suggest a hopefully helpful suggestions for the next word? -->
true
-
- 2
-
100
1100
diff --git a/java/res/values/donottranslate.xml b/java/res/values/donottranslate.xml
index 9a610a0d0..415dd0b65 100644
--- a/java/res/values/donottranslate.xml
+++ b/java/res/values/donottranslate.xml
@@ -47,17 +47,6 @@
Debug Mode
Force non-distinct multitouch
-
-
- - @string/keyboard_color_scheme_white
- - @string/keyboard_color_scheme_blue
-
-
-
- - 2
- - 0
-
-
+
+
+
+ - @string/keyboard_color_scheme_white
+ - @string/keyboard_color_scheme_blue
+
+ - Quantum
+
+
+
+ - 2
+ - 0
+ - 3
+
+
diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml
index 7d86dbd5d..61ebb6992 100644
--- a/java/res/xml/prefs.xml
+++ b/java/res/xml/prefs.xml
@@ -158,12 +158,11 @@
android:persistent="true"
android:defaultValue="false" />
+ android:entries="@array/keyboard_theme_names" />
() {
+ @Override
+ public int compare(final KeyboardTheme lhs, final KeyboardTheme rhs) {
+ if (lhs.mMinApiVersion > rhs.mMinApiVersion) return -1;
+ if (lhs.mMinApiVersion < rhs.mMinApiVersion) return 1;
+ return 0;
+ }
+ });
+ }
public final int mThemeId;
public final int mStyleId;
+ final int mMinApiVersion;
// Note: The themeId should be aligned with "themeId" attribute of Keyboard style
- // in values/style.xml.
- public KeyboardTheme(final int themeId, final int styleId) {
+ // in values/themes-