Use KeyboardTheme id insteand of index
This CL must be checked in together with I771216f8bd.
Bug: 14042743
Change-Id: I45c3acf9242985fb03721a9a6d377fbccc8e2019
diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml
index a39ce4a..3e3bedf 100644
--- a/java/res/xml/prefs.xml
+++ b/java/res/xml/prefs.xml
@@ -168,9 +168,9 @@
android:key="pref_keyboard_layout_20110916"
android:title="@string/keyboard_color_scheme"
android:persistent="true"
- android:entryValues="@array/keyboard_color_schemes_values"
- android:entries="@array/keyboard_color_schemes"
- android:defaultValue="@string/config_default_keyboard_theme_index" />
+ android:entryValues="@array/keyboard_theme_ids"
+ android:entries="@array/keyboard_theme_names"
+ android:defaultValue="@string/config_default_keyboard_theme_id" />
<PreferenceScreen
android:fragment="com.android.inputmethod.latin.settings.AdditionalSubtypeSettings"
android:key="custom_input_styles"
diff --git a/java/res/xml/prefs_for_debug.xml b/java/res/xml/prefs_for_debug.xml
index 7b2b8ea..7fab15b 100644
--- a/java/res/xml/prefs_for_debug.xml
+++ b/java/res/xml/prefs_for_debug.xml
@@ -33,7 +33,7 @@
android:persistent="true"
android:entryValues="@array/keyboard_layout_modes_values"
android:entries="@array/keyboard_layout_modes"
- android:defaultValue="@string/config_default_keyboard_theme_index" />
+ android:defaultValue="@string/config_default_keyboard_theme_id" />
<CheckBoxPreference
android:key="debug_mode"
android:title="@string/prefs_debug_mode"