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

am aa4e054d: am ce9c4171: Change separator titles in settings screen. 

* commit 'aa4e054dd69ffe597f9e06aa0d6eeb2c30585184':
  Change separator titles in settings screen.
main
Jean Chalard 2011-01-19 03:00:43 -08:00 committed by Android Git Automerger
parent 029511cc04 aa4e054dd6
commit 19bca2a227
3 changed files with 72 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
java/res/values/strings.xml
View File

@ -34,8 +34,11 @@
<!-- Option to control whether or not to show a popup with a larger font on each key press. --> <!-- Option to control whether or not to show a popup with a larger font on each key press. -->
<string name="popup_on_keypress">Popup on keypress</string> <string name="popup_on_keypress">Popup on keypress</string>
<!-- Category title for general settings for Android keyboard -->
<string name="general_category">General</string>
<!-- Category title for text prediction --> <!-- Category title for text prediction -->
<string name="prediction_category">Word suggestion settings</string> <string name="prediction_category">Text correction</string>
<!-- Option to enable auto capitalization of sentences --> <!-- Option to enable auto capitalization of sentences -->
<string name="auto_cap">Auto-capitalization</string> <string name="auto_cap">Auto-capitalization</string>
@ -46,7 +49,7 @@
<string name="quick_fixes_summary">Corrects commonly typed mistakes</string> <string name="quick_fixes_summary">Corrects commonly typed mistakes</string>
<!-- Option to enable showing suggestions --> <!-- Option to enable showing suggestions -->
<string name="prefs_show_suggestions">Show suggestions</string> <string name="prefs_show_suggestions">Show correction suggestions</string>
<!-- Description for show suggestions --> <!-- Description for show suggestions -->
<string name="prefs_show_suggestions_summary">Display suggested words while typing</string> <string name="prefs_show_suggestions_summary">Display suggested words while typing</string>
<string name="prefs_suggestion_visibility_show_name">Always show</string> <string name="prefs_suggestion_visibility_show_name">Always show</string>

108
java/res/xml/prefs.xml
View File

@ -4,9 +4,9 @@
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
You may obtain a copy of the License at You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0 http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -18,62 +18,68 @@
android:title="@string/english_ime_settings" android:title="@string/english_ime_settings"
android:key="english_ime_settings"> android:key="english_ime_settings">
<CheckBoxPreference <PreferenceCategory
android:key="auto_cap" android:title="@string/general_category"
android:title="@string/auto_cap" android:key="general_settings">
android:persistent="true"
android:defaultValue="true"
/>
<CheckBoxPreference <CheckBoxPreference
android:key="vibrate_on" android:key="auto_cap"
android:title="@string/vibrate_on_keypress" android:title="@string/auto_cap"
android:persistent="true" android:persistent="true"
/> android:defaultValue="true"
/>
<CheckBoxPreference <CheckBoxPreference
android:key="sound_on" android:key="vibrate_on"
android:title="@string/sound_on_keypress" android:title="@string/vibrate_on_keypress"
android:persistent="true" android:persistent="true"
/> />
<CheckBoxPreference <CheckBoxPreference
android:key="popup_on" android:key="sound_on"
android:title="@string/popup_on_keypress" android:title="@string/sound_on_keypress"
android:persistent="true" android:persistent="true"
android:defaultValue="@bool/config_default_popup_preview" />
/>
<CheckBoxPreference <CheckBoxPreference
android:key="recorrection_enabled" android:key="popup_on"
android:title="@string/prefs_enable_recorrection" android:title="@string/popup_on_keypress"
android:summary="@string/prefs_enable_recorrection_summary" android:persistent="true"
android:persistent="true" android:defaultValue="@bool/config_default_popup_preview"
android:defaultValue="@bool/default_recorrection_enabled" />
/>
<ListPreference <CheckBoxPreference
android:key="settings_key" android:key="recorrection_enabled"
android:title="@string/prefs_settings_key" android:title="@string/prefs_enable_recorrection"
android:persistent="true" android:summary="@string/prefs_enable_recorrection_summary"
android:entryValues="@array/settings_key_modes_values" android:persistent="true"
android:entries="@array/settings_key_modes" android:defaultValue="@bool/default_recorrection_enabled"
android:defaultValue="@string/settings_key_mode_auto" />
/>
<ListPreference <ListPreference
android:key="voice_mode" android:key="settings_key"
android:title="@string/voice_input" android:title="@string/prefs_settings_key"
android:persistent="true" android:persistent="true"
android:entryValues="@array/voice_input_modes_values" android:entryValues="@array/settings_key_modes_values"
android:entries="@array/voice_input_modes" android:entries="@array/settings_key_modes"
android:defaultValue="@string/voice_mode_main" android:defaultValue="@string/settings_key_mode_auto"
/> />
<PreferenceScreen <ListPreference
android:key="subtype_settings" android:key="voice_mode"
android:title="@string/language_selection_title" android:title="@string/voice_input"
android:summary="@string/language_selection_summary" /> android:persistent="true"
android:entryValues="@array/voice_input_modes_values"
android:entries="@array/voice_input_modes"
android:defaultValue="@string/voice_mode_main"
/>
<PreferenceScreen
android:key="subtype_settings"
android:title="@string/language_selection_title"
android:summary="@string/language_selection_summary" />
</PreferenceCategory>
<PreferenceCategory <PreferenceCategory
android:title="@string/prediction_category" android:title="@string/prediction_category"

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

@ -48,6 +48,7 @@ public class Settings extends PreferenceActivity
DialogInterface.OnDismissListener, OnPreferenceClickListener { DialogInterface.OnDismissListener, OnPreferenceClickListener {
private static final String TAG = "Settings"; private static final String TAG = "Settings";
public static final String PREF_GENERAL_SETTINGS_KEY = "general_settings";
public static final String PREF_VIBRATE_ON = "vibrate_on"; public static final String PREF_VIBRATE_ON = "vibrate_on";
public static final String PREF_SOUND_ON = "sound_on"; public static final String PREF_SOUND_ON = "sound_on";
public static final String PREF_POPUP_ON = "popup_on"; public static final String PREF_POPUP_ON = "popup_on";
@ -111,40 +112,42 @@ public class Settings extends PreferenceActivity
mBigramSuggestion = (CheckBoxPreference) findPreference(PREF_BIGRAM_SUGGESTIONS); mBigramSuggestion = (CheckBoxPreference) findPreference(PREF_BIGRAM_SUGGESTIONS);
ensureConsistencyOfAutoCorrectionSettings(); ensureConsistencyOfAutoCorrectionSettings();
final PreferenceGroup generalSettings =
(PreferenceGroup) findPreference(PREF_GENERAL_SETTINGS_KEY);
final boolean showSettingsKeyOption = getResources().getBoolean( final boolean showSettingsKeyOption = getResources().getBoolean(
R.bool.config_enable_show_settings_key_option); R.bool.config_enable_show_settings_key_option);
if (!showSettingsKeyOption) { if (!showSettingsKeyOption) {
getPreferenceScreen().removePreference(mSettingsKeyPreference); generalSettings.removePreference(mSettingsKeyPreference);
} }
final boolean showVoiceKeyOption = getResources().getBoolean( final boolean showVoiceKeyOption = getResources().getBoolean(
R.bool.config_enable_show_voice_key_option); R.bool.config_enable_show_voice_key_option);
if (!showVoiceKeyOption) { if (!showVoiceKeyOption) {
getPreferenceScreen().removePreference(mVoicePreference); generalSettings.removePreference(mVoicePreference);
} }
Vibrator vibrator = (Vibrator) getSystemService(VIBRATOR_SERVICE); Vibrator vibrator = (Vibrator) getSystemService(VIBRATOR_SERVICE);
if (vibrator == null || !vibrator.hasVibrator()) { if (vibrator == null || !vibrator.hasVibrator()) {
getPreferenceScreen().removePreference( generalSettings.removePreference(findPreference(PREF_VIBRATE_ON));
getPreferenceScreen().findPreference(PREF_VIBRATE_ON));
} }
final boolean showSubtypeSettings = getResources().getBoolean( final boolean showSubtypeSettings = getResources().getBoolean(
R.bool.config_enable_show_subtype_settings); R.bool.config_enable_show_subtype_settings);
if (!showSubtypeSettings) { if (!showSubtypeSettings) {
getPreferenceScreen().removePreference(findPreference(PREF_SUBTYPES)); generalSettings.removePreference(findPreference(PREF_SUBTYPES));
} }
final boolean showPopupOption = getResources().getBoolean( final boolean showPopupOption = getResources().getBoolean(
R.bool.config_enable_show_popup_on_keypress_option); R.bool.config_enable_show_popup_on_keypress_option);
if (!showPopupOption) { if (!showPopupOption) {
getPreferenceScreen().removePreference(findPreference(PREF_POPUP_ON)); generalSettings.removePreference(findPreference(PREF_POPUP_ON));
} }
final boolean showRecorrectionOption = getResources().getBoolean( final boolean showRecorrectionOption = getResources().getBoolean(
R.bool.config_enable_show_recorrection_option); R.bool.config_enable_show_recorrection_option);
if (!showRecorrectionOption) { if (!showRecorrectionOption) {
getPreferenceScreen().removePreference(findPreference(PREF_RECORRECTION_ENABLED)); generalSettings.removePreference(findPreference(PREF_RECORRECTION_ENABLED));
} }
} }