diff options
| author |   Jean Chalard <jchalard@google.com> | 2011-01-18 08:25:53 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2011-01-18 08:25:53 -0800 |
| commit | 626f897977f09b7fa458a63d907df20fa4c43043 (patch) | |
| tree | f0f7ad489f108ab63fc9b1aa1c07df0dc71b10a6 /java | |
| parent | 09882fae81e10f783a491373b6cad4e7aac7279f (diff) | |
| parent | 6c381b38cc19cc8174a7620e5726314a79ed7e43 (diff) | |
| download | latinime-626f897977f09b7fa458a63d907df20fa4c43043.tar.gz latinime-626f897977f09b7fa458a63d907df20fa4c43043.tar.xz latinime-626f897977f09b7fa458a63d907df20fa4c43043.zip | |
am 6c381b38: Remove the keyboard popup option by default.
* commit '6c381b38cc19cc8174a7620e5726314a79ed7e43':
Remove the keyboard popup option by default.
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/values-xlarge/config.xml | 1 | ||||
| -rw-r--r-- | java/res/values/config.xml | 1 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/Settings.java | 6 |
3 files changed, 8 insertions, 0 deletions
diff --git a/java/res/values-xlarge/config.xml b/java/res/values-xlarge/config.xml index 410b5e19e..912971793 100644 --- a/java/res/values-xlarge/config.xml +++ b/java/res/values-xlarge/config.xml @@ -22,6 +22,7 @@ <bool name="config_enable_show_settings_key_option">false</bool> <bool name="config_enable_show_subtype_settings">false</bool> <bool name="config_enable_show_voice_key_option">false</bool> + <bool name="config_enable_show_popup_on_keypress_option">false</bool> <bool name="config_candidate_highlight_font_color_enabled">false</bool> <bool name="config_swipe_down_dismiss_keyboard_enabled">false</bool> <bool name="config_sliding_key_input_enabled">false</bool> diff --git a/java/res/values/config.xml b/java/res/values/config.xml index 11b92e7c3..e5821075e 100644 --- a/java/res/values/config.xml +++ b/java/res/values/config.xml @@ -25,6 +25,7 @@ <bool name="config_enable_show_settings_key_option">true</bool> <bool name="config_enable_show_subtype_settings">true</bool> <bool name="config_enable_show_voice_key_option">true</bool> + <bool name="config_enable_show_popup_on_keypress_option">true</bool> <bool name="config_candidate_highlight_font_color_enabled">true</bool> <bool name="config_swipe_down_dismiss_keyboard_enabled">true</bool> <bool name="config_sliding_key_input_enabled">true</bool> diff --git a/java/src/com/android/inputmethod/latin/Settings.java b/java/src/com/android/inputmethod/latin/Settings.java index 064a80fe1..5db63b719 100644 --- a/java/src/com/android/inputmethod/latin/Settings.java +++ b/java/src/com/android/inputmethod/latin/Settings.java @@ -134,6 +134,12 @@ public class Settings extends PreferenceActivity if (!showSubtypeSettings) { getPreferenceScreen().removePreference(findPreference(PREF_SUBTYPES)); } + + final boolean showPopupOption = getResources().getBoolean( + R.bool.config_enable_show_popup_on_keypress_option); + if (!showPopupOption) { + getPreferenceScreen().removePreference(findPreference(PREF_POPUP_ON)); + } } @Override |