diff options
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/values/config-common.xml | 3 | ||||
| -rw-r--r-- | java/res/values/keyboard-themes.xml | 34 | ||||
| -rw-r--r-- | java/res/xml/prefs.xml | 5 |
3 files changed, 36 insertions, 6 deletions
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? --> <bool name="config_default_next_word_prediction">true</bool> - <!-- 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/keyboard-themes.xml b/java/res/values/keyboard-themes.xml new file mode 100644 index 000000000..0325f5be0 --- /dev/null +++ b/java/res/values/keyboard-themes.xml @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- For keyboard color scheme option dialog. --> + <string-array name="keyboard_theme_names" translatable="false"> + <item>@string/keyboard_color_scheme_white</item> + <item>@string/keyboard_color_scheme_blue</item> + <!-- TODO: Make this item as translatable string resource. --> + <item>Quantum</item> + </string-array> + <!-- An element must be a keyboard theme id of {@link KeyboardTheme#THEME_ID_*}. --> + <string-array name="keyboard_theme_ids" translatable="false"> + <item>2</item> + <item>0</item> + <item>3</item> + </string-array> +</resources> 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" /> <ListPreference - android:key="pref_keyboard_layout_20110916" + android:key="pref_keyboard_theme" android:title="@string/keyboard_color_scheme" android:persistent="true" android:entryValues="@array/keyboard_theme_ids" - android:entries="@array/keyboard_theme_names" - android:defaultValue="@string/config_default_keyboard_theme_id" /> + android:entries="@array/keyboard_theme_names" /> <PreferenceScreen android:fragment="com.android.inputmethod.latin.settings.AdditionalSubtypeSettings" android:key="custom_input_styles" |