nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 6c381b38: Remove the keyboard popup option by default. 

* commit '6c381b38cc19cc8174a7620e5726314a79ed7e43':
  Remove the keyboard popup option by default.
main
Jean Chalard 2011-01-18 08:25:53 -08:00 committed by Android Git Automerger
parent 09882fae81 6c381b38cc
commit 626f897977
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
java/res/values-xlarge/config.xml
View File

@ -22,6 +22,7 @@
<bool name="config_enable_show_settings_key_option">false</bool> <bool name="config_enable_show_settings_key_option">false</bool>
<bool name="config_enable_show_subtype_settings">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_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_candidate_highlight_font_color_enabled">false</bool>
<bool name="config_swipe_down_dismiss_keyboard_enabled">false</bool> <bool name="config_swipe_down_dismiss_keyboard_enabled">false</bool>
<bool name="config_sliding_key_input_enabled">false</bool> <bool name="config_sliding_key_input_enabled">false</bool>

1
java/res/values/config.xml
View File

@ -25,6 +25,7 @@
<bool name="config_enable_show_settings_key_option">true</bool> <bool name="config_enable_show_settings_key_option">true</bool>
<bool name="config_enable_show_subtype_settings">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_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_candidate_highlight_font_color_enabled">true</bool>
<bool name="config_swipe_down_dismiss_keyboard_enabled">true</bool> <bool name="config_swipe_down_dismiss_keyboard_enabled">true</bool>
<bool name="config_sliding_key_input_enabled">true</bool> <bool name="config_sliding_key_input_enabled">true</bool>

6
java/src/com/android/inputmethod/latin/Settings.java
View File

@ -134,6 +134,12 @@ public class Settings extends PreferenceActivity
if (!showSubtypeSettings) { if (!showSubtypeSettings) {
getPreferenceScreen().removePreference(findPreference(PREF_SUBTYPES)); 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 @Override