diff options
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/values-v20/platform-theme.xml (renamed from java/res/values-v21/platform-theme.xml) | 16 | ||||
| -rw-r--r-- | java/res/values/platform-theme.xml | 1 | ||||
| -rw-r--r-- | java/res/xml/prefs.xml | 154 | ||||
| -rw-r--r-- | java/res/xml/prefs_for_debug.xml | 24 | ||||
| -rw-r--r-- | java/res/xml/spell_checker_settings.xml | 8 |
5 files changed, 74 insertions, 129 deletions
diff --git a/java/res/values-v21/platform-theme.xml b/java/res/values-v20/platform-theme.xml index a49e36459..52e7f3521 100644 --- a/java/res/values-v21/platform-theme.xml +++ b/java/res/values-v20/platform-theme.xml @@ -18,21 +18,9 @@ */ --> +<!-- TODO: This file is temporarily placed under values-v20. --> +<!-- TODO: It might be moved under values-v21. --> <resources xmlns:android="http://schemas.android.com/apk/res/android"> <style name="platformActivityTheme" parent="@android:style/Theme.Material.Light" /> - <!-- From packages/apps/Settings --> - <style name="platformSettingsTheme" parent="@android:style/Theme.Material.Settings"> - <item name="android:actionBarStyle">@android:style/Widget.Material.Light.ActionBar.Solid</item> - <item name="android:alertDialogTheme">@style/Theme.AlertDialog</item> - </style> - <!-- From packages/apps/Settings --> - <style name="Theme.AlertDialog" parent="@*android:style/Theme.Material.Light.Dialog.Alert"> - <!-- Used by the ActionBar: @color/theme_primary --> - <item name="android:colorPrimary">#ff263238</item> - <!-- Used by the StatusBar: @color/theme_primary_dark --> - <item name="android:colorPrimaryDark">#ff21272b</item> - <!-- Used by controls, e.g. CheckBox, ProgressBar, etc.: @color/theme_accent --> - <item name="android:colorAccent">#ff009688</item> - </style> <style name="platformDialogTheme" parent="@android:style/Theme.Material.Light.Dialog" /> </resources> diff --git a/java/res/values/platform-theme.xml b/java/res/values/platform-theme.xml index e68859712..8e131a2b0 100644 --- a/java/res/values/platform-theme.xml +++ b/java/res/values/platform-theme.xml @@ -20,6 +20,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android"> <style name="platformActivityTheme" parent="@android:style/Theme.Holo" /> - <style name="platformSettingsTheme" parent="@android:style/Theme.Holo" /> <style name="platformDialogTheme" parent="@android:style/Theme.Holo.Dialog" /> </resources> diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml index cb951d264..e71d9517c 100644 --- a/java/res/xml/prefs.xml +++ b/java/res/xml/prefs.xml @@ -21,77 +21,61 @@ <PreferenceScreen android:title="@string/settings_screen_input" android:key="screen_input"> - <SwitchPreference + <CheckBoxPreference android:key="auto_cap" android:title="@string/auto_cap" android:summary="@string/auto_cap_summary" - android:switchTextOn="" - android:switchTextOff="" - android:persistent="true" - android:defaultValue="true" /> - <SwitchPreference + android:defaultValue="true" + android:persistent="true" /> + <CheckBoxPreference android:key="pref_key_use_double_space_period" android:title="@string/use_double_space_period" android:summary="@string/use_double_space_period_summary" - android:switchTextOn="" - android:switchTextOff="" - android:persistent="true" - android:defaultValue="true" /> - <SwitchPreference + android:defaultValue="true" + android:persistent="true" /> + <CheckBoxPreference android:key="vibrate_on" android:title="@string/vibrate_on_keypress" - android:switchTextOn="" - android:switchTextOff="" - android:persistent="true" - android:defaultValue="@bool/config_default_vibration_enabled" /> - <SwitchPreference + android:defaultValue="@bool/config_default_vibration_enabled" + android:persistent="true" /> + <CheckBoxPreference android:key="sound_on" android:title="@string/sound_on_keypress" - android:switchTextOn="" - android:switchTextOff="" - android:persistent="true" - android:defaultValue="@bool/config_default_sound_enabled" /> - <SwitchPreference + android:defaultValue="@bool/config_default_sound_enabled" + android:persistent="true" /> + <CheckBoxPreference android:key="popup_on" android:title="@string/popup_on_keypress" - android:switchTextOn="" - android:switchTextOff="" - android:persistent="true" - android:defaultValue="@bool/config_default_key_preview_popup" /> - <SwitchPreference + android:defaultValue="@bool/config_default_key_preview_popup" + android:persistent="true" /> + <CheckBoxPreference android:key="pref_voice_input_key" android:title="@string/voice_input" - android:switchTextOn="" - android:switchTextOff="" - android:persistent="true" - android:defaultValue="true" /> + android:defaultValue="true" + android:persistent="true" /> </PreferenceScreen> <ListPreference android:key="pref_keyboard_theme" android:title="@string/keyboard_theme" - android:persistent="true" android:entryValues="@array/keyboard_theme_ids" - android:entries="@array/keyboard_theme_names" /> + android:entries="@array/keyboard_theme_names" + android:persistent="true" /> <PreferenceScreen android:title="@string/settings_screen_multi_lingual" android:key="screen_multi_lingual"> - <SwitchPreference + <CheckBoxPreference android:key="pref_show_language_switch_key" android:title="@string/show_language_switch_key" android:summary="@string/show_language_switch_key_summary" - android:switchTextOn="" - android:switchTextOff="" - android:persistent="true" - android:defaultValue="true" /> - <SwitchPreference + android:defaultValue="true" + android:persistent="true" /> + <CheckBoxPreference android:key="pref_include_other_imes_in_language_switch_list" android:dependency="pref_show_language_switch_key" android:title="@string/include_other_imes_in_language_switch_list" android:summary="@string/include_other_imes_in_language_switch_list_summary" - android:switchTextOn="" - android:switchTextOff="" - android:persistent="true" - android:defaultValue="false" /> + android:defaultValue="false" + android:persistent="true" /> <PreferenceScreen android:fragment="com.android.inputmethod.latin.settings.AdditionalSubtypeSettings" android:key="custom_input_styles" @@ -100,31 +84,25 @@ <PreferenceScreen android:title="@string/settings_screen_gesture" android:key="screen_gesture"> - <SwitchPreference + <CheckBoxPreference android:key="gesture_input" android:title="@string/gesture_input" android:summary="@string/gesture_input_summary" - android:switchTextOn="" - android:switchTextOff="" - android:persistent="true" - android:defaultValue="true" /> - <SwitchPreference + android:defaultValue="true" + android:persistent="true" /> + <CheckBoxPreference android:key="pref_gesture_floating_preview_text" android:dependency="gesture_input" android:title="@string/gesture_floating_preview_text" android:summary="@string/gesture_floating_preview_text_summary" - android:switchTextOn="" - android:switchTextOff="" - android:persistent="true" - android:defaultValue="true" /> - <SwitchPreference + android:defaultValue="true" + android:persistent="true" /> + <CheckBoxPreference android:key="pref_gesture_preview_trail" android:dependency="gesture_input" android:title="@string/gesture_preview_trail" - android:switchTextOn="" - android:switchTextOff="" - android:persistent="true" - android:defaultValue="true" /> + android:defaultValue="true" + android:persistent="true" /> </PreferenceScreen> <PreferenceScreen android:title="@string/settings_screen_correction" @@ -145,55 +123,47 @@ android:value="@string/dictionary_pack_client_id" /> </intent> </PreferenceScreen> - <SwitchPreference + <CheckBoxPreference android:key="pref_key_block_potentially_offensive" android:title="@string/prefs_block_potentially_offensive_title" android:summary="@string/prefs_block_potentially_offensive_summary" - android:switchTextOn="" - android:switchTextOff="" - android:persistent="true" - android:defaultValue="@bool/config_block_potentially_offensive" /> + android:defaultValue="@bool/config_block_potentially_offensive" + android:persistent="true" /> <ListPreference android:key="auto_correction_threshold" android:title="@string/auto_correction" android:summary="@string/auto_correction_summary" - android:persistent="true" android:entryValues="@array/auto_correction_threshold_mode_indexes" android:entries="@array/auto_correction_threshold_modes" - android:defaultValue="@string/auto_correction_threshold_mode_index_modest" /> + android:defaultValue="@string/auto_correction_threshold_mode_index_modest" + android:persistent="true" /> <ListPreference android:key="show_suggestions_setting" android:summary="@string/prefs_show_suggestions_summary" android:title="@string/prefs_show_suggestions" - android:persistent="true" android:entryValues="@array/prefs_suggestion_visibility_values" android:entries="@array/prefs_suggestion_visibilities" - android:defaultValue="@string/prefs_suggestion_visibility_default_value" /> - <SwitchPreference + android:defaultValue="@string/prefs_suggestion_visibility_default_value" + android:persistent="true" /> + <CheckBoxPreference android:key="pref_key_use_personalized_dicts" android:title="@string/use_personalized_dicts" android:summary="@string/use_personalized_dicts_summary" - android:switchTextOn="" - android:switchTextOff="" - android:persistent="true" - android:defaultValue="true" /> - <SwitchPreference + android:defaultValue="true" + android:persistent="true" /> + <CheckBoxPreference android:key="pref_key_use_contacts_dict" android:title="@string/use_contacts_dict" android:summary="@string/use_contacts_dict_summary" - android:switchTextOn="" - android:switchTextOff="" - android:persistent="true" - android:defaultValue="true" /> - <SwitchPreference + android:defaultValue="true" + android:persistent="true" /> + <CheckBoxPreference android:key="next_word_prediction" android:title="@string/bigram_prediction" android:summary="@string/bigram_prediction_summary" - android:switchTextOn="" - android:switchTextOff="" - android:persistent="true" - android:defaultValue="true" /> - </PreferenceScreen> + android:defaultValue="true" + android:persistent="true" /> + </PreferenceScreen> <PreferenceScreen android:title="@string/settings_screen_advanced" android:key="screen_advanced"> @@ -211,24 +181,20 @@ latin:maxValue="100" /> <!-- percent --> <!-- The settigs for showing setup wizard application icon shouldn't be persistent and the default value is added programmatically. --> - <SwitchPreference + <CheckBoxPreference android:key="pref_show_setup_wizard_icon" android:title="@string/show_setup_wizard_icon" - android:summary="@string/show_setup_wizard_icon_summary" - android:switchTextOn="" - android:switchTextOff="" /> + android:summary="@string/show_setup_wizard_icon_summary" /> <!-- title will be set programmatically to embed application name --> - <SwitchPreference + <CheckBoxPreference android:key="pref_enable_metrics_logging" android:summary="@string/enable_metrics_logging_summary" - android:switchTextOn="" - android:switchTextOff="" - android:persistent="true" - android:defaultValue="true" /> + android:defaultValue="true" + android:persistent="true" /> <PreferenceScreen android:key="screen_debug" android:title="Debug settings" - android:persistent="true" - android:defaultValue="false" /> - </PreferenceScreen> + android:defaultValue="false" + android:persistent="true" /> + </PreferenceScreen> </PreferenceScreen> diff --git a/java/res/xml/prefs_for_debug.xml b/java/res/xml/prefs_for_debug.xml index be4c8b3e1..ae29a8a82 100644 --- a/java/res/xml/prefs_for_debug.xml +++ b/java/res/xml/prefs_for_debug.xml @@ -20,28 +20,22 @@ android:title="@string/prefs_debug_mode" android:key="english_ime_debug_settings" > - <SwitchPreference + <CheckBoxPreference android:key="debug_mode" android:title="@string/prefs_debug_mode" - android:switchTextOn="" - android:switchTextOff="" - android:persistent="true" - android:defaultValue="false" /> - <SwitchPreference + android:defaultValue="false" + android:persistent="true" /> + <CheckBoxPreference android:key="force_non_distinct_multitouch" android:title="@string/prefs_force_non_distinct_multitouch" - android:switchTextOn="" - android:switchTextOff="" - android:persistent="true" - android:defaultValue="false" /> - <SwitchPreference + android:defaultValue="false" + android:persistent="true" /> + <CheckBoxPreference android:key="pref_sliding_key_input_preview" android:title="@string/sliding_key_input_preview" android:summary="@string/sliding_key_input_preview_summary" - android:switchTextOn="" - android:switchTextOff="" - android:persistent="true" - android:defaultValue="true" /> + android:defaultValue="true" + android:persistent="true" /> <com.android.inputmethod.latin.settings.SeekBarDialogPreference android:key="pref_key_longpress_timeout" android:title="@string/prefs_key_longpress_timeout_settings" diff --git a/java/res/xml/spell_checker_settings.xml b/java/res/xml/spell_checker_settings.xml index e3db4850b..3d9501857 100644 --- a/java/res/xml/spell_checker_settings.xml +++ b/java/res/xml/spell_checker_settings.xml @@ -17,12 +17,10 @@ <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" > - <SwitchPreference + <CheckBoxPreference android:key="pref_spellcheck_use_contacts" android:title="@string/use_contacts_for_spellchecking_option_title" android:summary="@string/use_contacts_for_spellchecking_option_summary" - android:switchTextOn="" - android:switchTextOff="" - android:persistent="true" - android:defaultValue="true" /> + android:defaultValue="true" + android:persistent="true" /> </PreferenceScreen> |