diff options
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/values/config-common.xml | 4 | ||||
| -rw-r--r-- | java/res/values/donottranslate.xml | 8 | ||||
| -rw-r--r-- | java/res/xml/prefs.xml | 6 | ||||
| -rw-r--r-- | java/res/xml/prefs_for_debug.xml | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/java/res/values/config-common.xml b/java/res/values/config-common.xml index 20d5860e3..3fe4b947c 100644 --- a/java/res/values/config-common.xml +++ b/java/res/values/config-common.xml @@ -24,8 +24,8 @@ at input history to suggest a hopefully helpful suggestions for the next word? --> <bool name="config_default_next_word_prediction">true</bool> - <!-- This configuration is an index of {@link KeyboardSwitcher#KEYBOARD_THEMES[]}. --> - <string name="config_default_keyboard_theme_index" translatable="false">2</string> + <!-- This configuration must be aligned with {@link KeyboardTheme#DEFAULT_THEME_ID}. --> + <string name="config_default_keyboard_theme_id" translatable="false">2</string> <integer name="config_delay_update_shift_state">100</integer> <integer name="config_double_space_period_timeout">1100</integer> diff --git a/java/res/values/donottranslate.xml b/java/res/values/donottranslate.xml index 4be5863f2..99775104d 100644 --- a/java/res/values/donottranslate.xml +++ b/java/res/values/donottranslate.xml @@ -58,7 +58,7 @@ <item>@string/layout_gingerbread</item> <item>@string/layout_klp</item> </string-array> - <!-- An element must be an index of {@link KeyboardSwitcher#KEYBOARD_THEMES[]}. --> + <!-- An element must be a keyboard theme id of {@link KeyboardTheme#THEME_ID_*}. --> <string-array name="keyboard_layout_modes_values"> <item>0</item> <item>1</item> @@ -66,12 +66,12 @@ </string-array> <!-- For keyboard color scheme option dialog. --> - <string-array name="keyboard_color_schemes"> + <string-array name="keyboard_theme_names"> <item>@string/keyboard_color_scheme_white</item> <item>@string/keyboard_color_scheme_blue</item> </string-array> - <!-- An element must be an index of {@link KeyboardSwitcher#KEYBOARD_THEMES[]}. --> - <string-array name="keyboard_color_schemes_values"> + <!-- An element must be a keyboard theme id of {@link KeyboardTheme#THEME_ID_*}. --> + <string-array name="keyboard_theme_ids"> <item>2</item> <item>0</item> </string-array> diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml index a39ce4ae8..3e3bedf15 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 7b2b8eab4..7fab15bab 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" |