moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2025-02-17 07:30:16 -05:00
Code Issues Releases Wiki Activity

- Added android:persistent="false" attribute to *Preference elements in global, account, and folder settings XML files to prevent automatic persistence to SharedPreferences. We're using our own storage system!

Browse Source 
- "Prettified" XML files
This commit is contained in:
cketti 2010-11-04 02:47:53 +00:00
parent fb55aa5bfb
commit 506f43faba
4 changed files with 347 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

209
res/xml/account_settings_preferences.xml
View File

@ -14,6 +14,12 @@
limitations under the License. limitations under the License.
--> -->
<!--
Make sure to add android:persistent="false" to all preferences to disable saving
the preference values to SharedPreferences. We use our own storage mechanism for
the preferences. See com.fsck.k9.preferences.Storage.
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceScreen <PreferenceScreen
@ -21,6 +27,7 @@
android:key="account_settings"> android:key="account_settings">
<EditTextPreference <EditTextPreference
android:persistent="false"
android:key="account_description" android:key="account_description"
android:singleLine="true" android:singleLine="true"
android:title="@string/account_settings_description_label" android:title="@string/account_settings_description_label"
@ -28,64 +35,75 @@
android:dialogTitle="@string/account_settings_description_label" /> android:dialogTitle="@string/account_settings_description_label" />
<CheckBoxPreference <CheckBoxPreference
android:persistent="false"
android:key="account_default" android:key="account_default"
android:title="@string/account_settings_default_label" android:title="@string/account_settings_default_label"
android:summary="@string/account_settings_default_summary" /> android:summary="@string/account_settings_default_summary" />
</PreferenceScreen> </PreferenceScreen>
<PreferenceScreen android:title="@string/account_settings_display_prefs_title"> <PreferenceScreen
<PreferenceCategory android:title="@string/account_settings_message_lists" android:key="lists"> android:title="@string/account_settings_display_prefs_title">
<Preference <PreferenceCategory
android:key="chip_color" android:title="@string/account_settings_message_lists"
android:singleLine="true" android:key="lists">
android:title="@string/account_settings_color_label"
android:summary="@string/account_settings_color_summary" />
<Preference
android:persistent="false"
android:key="chip_color"
android:singleLine="true"
android:title="@string/account_settings_color_label"
android:summary="@string/account_settings_color_summary" />
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory android:title="@string/account_settings_message_view" android:key="view"> <PreferenceCategory
android:title="@string/account_settings_message_view"
android:key="view">
<ListPreference <ListPreference
android:key="show_pictures_enum" android:persistent="false"
android:title="@string/account_settings_show_pictures_label" android:key="show_pictures_enum"
android:entries="@array/account_settings_show_pictures_entries" android:title="@string/account_settings_show_pictures_label"
android:entryValues="@array/account_settings_show_pictures_values" android:entries="@array/account_settings_show_pictures_entries"
android:dialogTitle="@string/account_settings_show_pictures_label" /> android:entryValues="@array/account_settings_show_pictures_values"
android:dialogTitle="@string/account_settings_show_pictures_label" />
<ListPreference
android:persistent="false"
android:key="hide_buttons_enum"
android:title="@string/account_settings_hide_buttons_label"
android:entries="@array/account_settings_hide_buttons_entries"
android:entryValues="@array/account_settings_hide_buttons_values"
android:dialogTitle="@string/account_settings_hide_buttons_label" />
<CheckBoxPreference
android:persistent="false"
android:key="enable_move_buttons"
android:title="@string/account_settings_enable_move_buttons_label"
android:defaultValue="true"
android:summary="@string/account_settings_enable_move_buttons_summary" />
<ListPreference <ListPreference
android:key="hide_buttons_enum" android:persistent="false"
android:title="@string/account_settings_hide_buttons_label" android:key="hide_move_buttons_enum"
android:entries="@array/account_settings_hide_buttons_entries" android:dependency="enable_move_buttons"
android:entryValues="@array/account_settings_hide_buttons_values" android:title="@string/account_settings_hide_move_buttons_label"
android:dialogTitle="@string/account_settings_hide_buttons_label" /> android:entries="@array/account_settings_hide_move_buttons_entries"
android:entryValues="@array/account_settings_hide_move_buttons_values"
android:dialogTitle="@string/account_settings_hide_move_buttons_label" />
<CheckBoxPreference </PreferenceCategory>
android:key="enable_move_buttons"
android:title="@string/account_settings_enable_move_buttons_label"
android:defaultValue="true"
android:summary="@string/account_settings_enable_move_buttons_summary" />
<ListPreference
android:key="hide_move_buttons_enum"
android:dependency="enable_move_buttons"
android:title="@string/account_settings_hide_move_buttons_label"
android:entries="@array/account_settings_hide_move_buttons_entries"
android:entryValues="@array/account_settings_hide_move_buttons_values"
android:dialogTitle="@string/account_settings_hide_move_buttons_label" />
</PreferenceCategory>
</PreferenceScreen> </PreferenceScreen>
<PreferenceScreen android:title="@string/account_settings_sync" android:key="incoming_prefs"> <PreferenceScreen
android:title="@string/account_settings_sync"
android:key="incoming_prefs">
<ListPreference <ListPreference
android:persistent="false"
android:key="account_display_count" android:key="account_display_count"
android:title="@string/account_settings_mail_display_count_label" android:title="@string/account_settings_mail_display_count_label"
android:entries="@array/account_settings_display_count_entries" android:entries="@array/account_settings_display_count_entries"
@ -93,6 +111,7 @@
android:dialogTitle="@string/account_settings_mail_display_count_label" /> android:dialogTitle="@string/account_settings_mail_display_count_label" />
<ListPreference <ListPreference
android:persistent="false"
android:key="account_message_age" android:key="account_message_age"
android:title="@string/account_settings_message_age_label" android:title="@string/account_settings_message_age_label"
android:entries="@array/account_settings_message_age_entries" android:entries="@array/account_settings_message_age_entries"
@ -100,20 +119,23 @@
android:dialogTitle="@string/account_settings_message_age_label" /> android:dialogTitle="@string/account_settings_message_age_label" />
<ListPreference <ListPreference
android:persistent="false"
android:key="account_autodownload_size" android:key="account_autodownload_size"
android:title="@string/account_settings_autodownload_message_size_label" android:title="@string/account_settings_autodownload_message_size_label"
android:entries="@array/account_settings_autodownload_message_size_entries" android:entries="@array/account_settings_autodownload_message_size_entries"
android:entryValues="@array/account_settings_autodownload_message_size_values" android:entryValues="@array/account_settings_autodownload_message_size_values"
android:dialogTitle="@string/account_settings_autodownload_message_size_label" /> android:dialogTitle="@string/account_settings_autodownload_message_size_label" />
<ListPreference <ListPreference
android:persistent="false"
android:key="account_check_frequency" android:key="account_check_frequency"
android:title="@string/account_settings_mail_check_frequency_label" android:title="@string/account_settings_mail_check_frequency_label"
android:entries="@array/account_settings_check_frequency_entries" android:entries="@array/account_settings_check_frequency_entries"
android:entryValues="@array/account_settings_check_frequency_values" android:entryValues="@array/account_settings_check_frequency_values"
android:dialogTitle="@string/account_settings_mail_check_frequency_label" /> android:dialogTitle="@string/account_settings_mail_check_frequency_label" />
<ListPreference <ListPreference
android:persistent="false"
android:key="folder_sync_mode" android:key="folder_sync_mode"
android:title="@string/account_settings_folder_sync_mode_label" android:title="@string/account_settings_folder_sync_mode_label"
android:entries="@array/account_settings_folder_sync_mode_entries" android:entries="@array/account_settings_folder_sync_mode_entries"
@ -121,63 +143,77 @@
android:dialogTitle="@string/account_settings_folder_sync_mode_label" /> android:dialogTitle="@string/account_settings_folder_sync_mode_label" />
<ListPreference <ListPreference
android:persistent="false"
android:key="folder_push_mode" android:key="folder_push_mode"
android:title="@string/account_settings_folder_push_mode_label" android:title="@string/account_settings_folder_push_mode_label"
android:entries="@array/account_settings_folder_push_mode_entries" android:entries="@array/account_settings_folder_push_mode_entries"
android:entryValues="@array/account_settings_folder_push_mode_values" android:entryValues="@array/account_settings_folder_push_mode_values"
android:dialogTitle="@string/account_settings_folder_push_mode_label" /> android:dialogTitle="@string/account_settings_folder_push_mode_label" />
<CheckBoxPreference <CheckBoxPreference
android:persistent="false"
android:key="account_sync_remote_deletetions" android:key="account_sync_remote_deletetions"
android:title="@string/account_settings_sync_remote_deletetions_label" android:title="@string/account_settings_sync_remote_deletetions_label"
android:defaultValue="true" android:defaultValue="true"
android:summary="@string/account_settings_sync_remote_deletetions_summary" /> android:summary="@string/account_settings_sync_remote_deletetions_summary" />
<ListPreference <ListPreference
android:persistent="false"
android:key="delete_policy" android:key="delete_policy"
android:title="@string/account_setup_incoming_delete_policy_label" android:title="@string/account_setup_incoming_delete_policy_label"
android:entries="@array/account_setup_delete_policy_entries" android:entries="@array/account_setup_delete_policy_entries"
android:entryValues="@array/account_setup_delete_policy_values" android:entryValues="@array/account_setup_delete_policy_values"
android:dialogTitle="@string/account_setup_incoming_delete_policy_label" /> android:dialogTitle="@string/account_setup_incoming_delete_policy_label" />
<ListPreference <ListPreference
android:persistent="false"
android:key="expunge_policy" android:key="expunge_policy"
android:title="@string/account_setup_expunge_policy_label" android:title="@string/account_setup_expunge_policy_label"
android:entries="@array/account_setup_expunge_policy_entries" android:entries="@array/account_setup_expunge_policy_entries"
android:entryValues="@array/account_setup_expunge_policy_values" android:entryValues="@array/account_setup_expunge_policy_values"
android:dialogTitle="@string/account_setup_expunge_policy_label" /> android:dialogTitle="@string/account_setup_expunge_policy_label" />
<CheckBoxPreference <CheckBoxPreference
android:persistent="false"
android:title="@string/account_setup_incoming_save_all_headers_title" android:title="@string/account_setup_incoming_save_all_headers_title"
android:key="account_save_all_headers" android:key="account_save_all_headers"
android:summary="@string/account_setup_incoming_save_all_headers_label" /> android:summary="@string/account_setup_incoming_save_all_headers_label" />
<PreferenceScreen <PreferenceScreen
android:key="incoming" android:key="incoming"
android:title="@string/account_settings_incoming_label" android:title="@string/account_settings_incoming_label"
android:summary="@string/account_settings_incoming_summary" /> android:summary="@string/account_settings_incoming_summary" />
<PreferenceScreen
<PreferenceScreen
android:key="push_advanced" android:key="push_advanced"
android:title="@string/account_settings_push_advanced_title"> android:title="@string/account_settings_push_advanced_title">
<CheckBoxPreference
android:key="push_poll_on_connect" <CheckBoxPreference
android:title="@string/push_poll_on_connect_label" android:persistent="false"
/> android:key="push_poll_on_connect"
<ListPreference android:title="@string/push_poll_on_connect_label" />
android:key="max_push_folders"
android:title="@string/account_setup_push_limit_label" <ListPreference
android:entries="@array/account_settings_push_limit_entries" android:persistent="false"
android:entryValues="@array/account_settings_push_limit_values" android:key="max_push_folders"
/> android:title="@string/account_setup_push_limit_label"
<ListPreference android:entries="@array/account_settings_push_limit_entries"
android:key="idle_refresh_period" android:entryValues="@array/account_settings_push_limit_values" />
android:title="@string/idle_refresh_period_label"
android:entries="@array/idle_refresh_period_entries" <ListPreference
android:entryValues="@array/idle_refresh_period_values" android:persistent="false"
/> android:key="idle_refresh_period"
</PreferenceScreen> android:title="@string/idle_refresh_period_label"
android:entries="@array/idle_refresh_period_entries"
android:entryValues="@array/idle_refresh_period_values" />
</PreferenceScreen>
</PreferenceScreen> </PreferenceScreen>
<PreferenceScreen
<PreferenceScreen android:title="@string/account_settings_composition" android:key="composing"> android:title="@string/account_settings_composition"
android:key="composing">
<PreferenceScreen <PreferenceScreen
android:key="composition" android:key="composition"
@ -189,72 +225,90 @@
android:title="@string/account_settings_identities_label" android:title="@string/account_settings_identities_label"
android:summary="@string/account_settings_identities_summary" /> android:summary="@string/account_settings_identities_summary" />
<CheckBoxPreference <CheckBoxPreference
android:persistent="false"
android:key="reply_after_quote" android:key="reply_after_quote"
android:title="@string/account_settings_reply_after_quote_label" android:title="@string/account_settings_reply_after_quote_label"
android:defaultValue="false" android:defaultValue="false"
android:summary="@string/account_settings_reply_after_quote_summary" /> android:summary="@string/account_settings_reply_after_quote_summary" />
<EditTextPreference <EditTextPreference
android:persistent="false"
android:key="account_quote_prefix" android:key="account_quote_prefix"
android:singleLine="true" android:singleLine="true"
android:title="@string/account_settings_quote_prefix_label" android:title="@string/account_settings_quote_prefix_label"
android:summary="" android:summary=""
android:dialogTitle="@string/account_settings_quote_prefix_label" /> android:dialogTitle="@string/account_settings_quote_prefix_label" />
<PreferenceScreen <PreferenceScreen
android:key="outgoing" android:key="outgoing"
android:title="@string/account_settings_outgoing_label" android:title="@string/account_settings_outgoing_label"
android:summary="@string/account_settings_outgoing_summary" /> android:summary="@string/account_settings_outgoing_summary" />
</PreferenceScreen> </PreferenceScreen>
<PreferenceScreen android:title="@string/account_settings_folders" android:key="folders">
<PreferenceScreen
android:title="@string/account_settings_folders"
android:key="folders">
<Preference <Preference
android:persistent="false"
android:key="account_setup_auto_expand_folder" android:key="account_setup_auto_expand_folder"
android:singleLine="true" android:singleLine="true"
android:title="@string/account_setup_auto_expand_folder" android:title="@string/account_setup_auto_expand_folder"
android:summary="" /> android:summary="" />
<ListPreference <ListPreference
android:persistent="false"
android:key="folder_display_mode" android:key="folder_display_mode"
android:title="@string/account_settings_folder_display_mode_label" android:title="@string/account_settings_folder_display_mode_label"
android:entries="@array/account_settings_folder_display_mode_entries" android:entries="@array/account_settings_folder_display_mode_entries"
android:entryValues="@array/account_settings_folder_display_mode_values" android:entryValues="@array/account_settings_folder_display_mode_values"
android:dialogTitle="@string/account_settings_folder_display_mode_label" /> android:dialogTitle="@string/account_settings_folder_display_mode_label" />
<ListPreference <ListPreference
android:persistent="false"
android:key="folder_target_mode" android:key="folder_target_mode"
android:title="@string/account_settings_folder_target_mode_label" android:title="@string/account_settings_folder_target_mode_label"
android:entries="@array/account_settings_folder_target_mode_entries" android:entries="@array/account_settings_folder_target_mode_entries"
android:entryValues="@array/account_settings_folder_target_mode_values" android:entryValues="@array/account_settings_folder_target_mode_values"
android:dialogTitle="@string/account_settings_folder_target_mode_label" /> android:dialogTitle="@string/account_settings_folder_target_mode_label" />
<ListPreference <ListPreference
android:persistent="false"
android:key="searchable_folders" android:key="searchable_folders"
android:title="@string/account_settings_searchable_label" android:title="@string/account_settings_searchable_label"
android:entries="@array/account_settings_searchable_entries" android:entries="@array/account_settings_searchable_entries"
android:entryValues="@array/account_settings_searchable_values" android:entryValues="@array/account_settings_searchable_values"
android:dialogTitle="@string/account_settings_searchable_label" /> android:dialogTitle="@string/account_settings_searchable_label" />
</PreferenceScreen> </PreferenceScreen>
<PreferenceScreen android:title="@string/account_settings_notifications" android:key="notifications"> <PreferenceScreen
android:title="@string/account_settings_notifications"
android:key="notifications">
<CheckBoxPreference <CheckBoxPreference
android:persistent="false"
android:key="account_notify" android:key="account_notify"
android:title="@string/account_settings_notify_label" android:title="@string/account_settings_notify_label"
android:defaultValue="true" android:defaultValue="true"
android:summary="@string/account_settings_notify_summary" /> android:summary="@string/account_settings_notify_summary" />
<CheckBoxPreference <CheckBoxPreference
android:persistent="false"
android:key="account_notify_self" android:key="account_notify_self"
android:dependency="account_notify" android:dependency="account_notify"
android:title="@string/account_settings_notify_self_label" android:title="@string/account_settings_notify_self_label"
android:defaultValue="true" android:defaultValue="true"
android:summary="@string/account_settings_notify_self_summary" /> android:summary="@string/account_settings_notify_self_summary" />
<!--
We can't disable persisting the ringtone value to SharedPreferences
because it's needed to actually access the value.
See com.fsck.k9.activity.setup.AccountSettings
-->
<RingtonePreference <RingtonePreference
android:layout="?android:attr/preferenceLayoutChild" android:layout="?android:attr/preferenceLayoutChild"
android:dependency="account_notify" android:dependency="account_notify"
@ -264,6 +318,7 @@
android:defaultValue="content://settings/system/notification_sound" /> android:defaultValue="content://settings/system/notification_sound" />
<CheckBoxPreference <CheckBoxPreference
android:persistent="false"
android:layout="?android:attr/preferenceLayoutChild" android:layout="?android:attr/preferenceLayoutChild"
android:dependency="account_notify" android:dependency="account_notify"
android:key="account_vibrate" android:key="account_vibrate"
@ -272,6 +327,7 @@
android:summary="@string/account_settings_vibrate_summary" /> android:summary="@string/account_settings_vibrate_summary" />
<ListPreference <ListPreference
android:persistent="false"
android:dependency="account_vibrate" android:dependency="account_vibrate"
android:key="account_vibrate_pattern" android:key="account_vibrate_pattern"
android:title="@string/account_settings_vibrate_pattern_label" android:title="@string/account_settings_vibrate_pattern_label"
@ -280,6 +336,7 @@
android:dialogTitle="@string/account_settings_vibrate_pattern_label" /> android:dialogTitle="@string/account_settings_vibrate_pattern_label" />
<ListPreference <ListPreference
android:persistent="false"
android:dependency="account_vibrate" android:dependency="account_vibrate"
android:key="account_vibrate_times" android:key="account_vibrate_times"
android:title="@string/account_settings_vibrate_times" android:title="@string/account_settings_vibrate_times"
@ -288,25 +345,29 @@
android:dialogTitle="@string/account_settings_vibrate_times" /> android:dialogTitle="@string/account_settings_vibrate_times" />
<CheckBoxPreference <CheckBoxPreference
android:persistent="false"
android:key="account_led" android:key="account_led"
android:dependency="account_notify" android:dependency="account_notify"
android:title="@string/account_settings_led_label" android:title="@string/account_settings_led_label"
android:summary="@string/account_settings_led_summary" android:summary="@string/account_settings_led_summary"
android:defaultValue="true" android:defaultValue="true" />
/>
<Preference <Preference
android:persistent="false"
android:key="led_color" android:key="led_color"
android:singleLine="true" android:singleLine="true"
android:title="@string/account_settings_led_color_label" android:title="@string/account_settings_led_color_label"
android:summary="@string/account_settings_led_color_summary" /> android:summary="@string/account_settings_led_color_summary" />
<CheckBoxPreference <CheckBoxPreference
android:persistent="false"
android:key="account_notify_sync" android:key="account_notify_sync"
android:title="@string/account_settings_notify_sync_label" android:title="@string/account_settings_notify_sync_label"
android:defaultValue="true" android:defaultValue="true"
android:summary="@string/account_settings_notify_sync_summary" /> android:summary="@string/account_settings_notify_sync_summary" />
<CheckBoxPreference <CheckBoxPreference
android:persistent="false"
android:key="notification_opens_unread" android:key="notification_opens_unread"
android:title="@string/account_settings_notification_opens_unread_label" android:title="@string/account_settings_notification_opens_unread_label"
android:defaultValue="true" android:defaultValue="true"
@ -314,9 +375,12 @@
</PreferenceScreen> </PreferenceScreen>
<PreferenceScreen android:title="@string/account_settings_crypto" android:key="crypto"> <PreferenceScreen
android:title="@string/account_settings_crypto"
android:key="crypto">
<ListPreference <ListPreference
android:persistent="false"
android:key="crypto_app" android:key="crypto_app"
android:title="@string/account_settings_crypto_app" android:title="@string/account_settings_crypto_app"
android:entries="@array/account_settings_crypto_app_entries" android:entries="@array/account_settings_crypto_app_entries"
@ -324,6 +388,7 @@
android:dialogTitle="@string/account_settings_crypto_app" /> android:dialogTitle="@string/account_settings_crypto_app" />
<CheckBoxPreference <CheckBoxPreference
android:persistent="false"
android:key="crypto_auto_signature" android:key="crypto_auto_signature"
android:title="@string/account_settings_crypto_auto_signature" android:title="@string/account_settings_crypto_auto_signature"
android:summary="@string/account_settings_crypto_auto_signature_summary" android:summary="@string/account_settings_crypto_auto_signature_summary"

28
res/xml/folder_settings_preferences.xml
View File

@ -14,41 +14,53 @@
limitations under the License. limitations under the License.
--> -->
<!--
Make sure to add android:persistent="false" to all preferences to disable saving
the preference values to SharedPreferences. We use our own storage mechanism for
the preferences. See com.fsck.k9.preferences.Storage.
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceCategory <PreferenceCategory
android:key="folder_settings"> android:key="folder_settings">
<CheckBoxPreference <CheckBoxPreference
android:persistent="false"
android:key="folder_settings_in_top_group" android:key="folder_settings_in_top_group"
android:title="@string/folder_settings_in_top_group_label" android:title="@string/folder_settings_in_top_group_label"
android:summary="@string/folder_settings_in_top_group_summary" /> android:summary="@string/folder_settings_in_top_group_summary" />
<ListPreference <ListPreference
android:persistent="false"
android:key="folder_settings_folder_display_mode" android:key="folder_settings_folder_display_mode"
android:title="@string/folder_settings_folder_display_mode_label" android:title="@string/folder_settings_folder_display_mode_label"
android:entries="@array/folder_settings_folder_display_mode_entries" android:entries="@array/folder_settings_folder_display_mode_entries"
android:entryValues="@array/folder_settings_folder_display_mode_values" android:entryValues="@array/folder_settings_folder_display_mode_values"
android:dialogTitle="@string/folder_settings_folder_display_mode_label" /> android:dialogTitle="@string/folder_settings_folder_display_mode_label" />
<ListPreference <ListPreference
android:persistent="false"
android:key="folder_settings_folder_sync_mode" android:key="folder_settings_folder_sync_mode"
android:title="@string/folder_settings_folder_sync_mode_label" android:title="@string/folder_settings_folder_sync_mode_label"
android:entries="@array/folder_settings_folder_sync_mode_entries" android:entries="@array/folder_settings_folder_sync_mode_entries"
android:entryValues="@array/folder_settings_folder_sync_mode_values" android:entryValues="@array/folder_settings_folder_sync_mode_values"
android:dialogTitle="@string/folder_settings_folder_sync_mode_label" /> android:dialogTitle="@string/folder_settings_folder_sync_mode_label" />
<ListPreference <ListPreference
android:persistent="false"
android:key="folder_settings_folder_push_mode" android:key="folder_settings_folder_push_mode"
android:title="@string/folder_settings_folder_push_mode_label" android:title="@string/folder_settings_folder_push_mode_label"
android:entries="@array/folder_settings_folder_push_mode_entries" android:entries="@array/folder_settings_folder_push_mode_entries"
android:entryValues="@array/folder_settings_folder_push_mode_values" android:entryValues="@array/folder_settings_folder_push_mode_values"
android:dialogTitle="@string/folder_settings_folder_push_mode_label" /> android:dialogTitle="@string/folder_settings_folder_push_mode_label" />
<CheckBoxPreference <CheckBoxPreference
android:persistent="false"
android:key="folder_settings_include_in_integrated_inbox" android:key="folder_settings_include_in_integrated_inbox"
android:title="@string/folder_settings_include_in_integrated_inbox_label" android:title="@string/folder_settings_include_in_integrated_inbox_label"
android:summary="@string/folder_settings_include_in_integrated_inbox_summary" /> android:summary="@string/folder_settings_include_in_integrated_inbox_summary" />
</PreferenceCategory> </PreferenceCategory>
</PreferenceScreen> </PreferenceScreen>

40
res/xml/font_preferences.xml
View File

@ -1,10 +1,19 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!--
Make sure to add android:persistent="false" to all preferences to disable saving
the preference values to SharedPreferences. We use our own storage mechanism for
the preferences. See com.fsck.k9.preferences.Storage.
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceScreen android:title="@string/font_size_account_list" android:key="account_list_fonts"> <PreferenceScreen
android:title="@string/font_size_account_list"
android:key="account_list_fonts">
<ListPreference <ListPreference
android:persistent="false"
android:key="account_name_font" android:key="account_name_font"
android:title="@string/font_size_account_name" android:title="@string/font_size_account_name"
android:entries="@array/font_entries" android:entries="@array/font_entries"
@ -12,6 +21,7 @@
android:dialogTitle="@string/font_size_account_name" /> android:dialogTitle="@string/font_size_account_name" />
<ListPreference <ListPreference
android:persistent="false"
android:key="account_description_font" android:key="account_description_font"
android:title="@string/font_size_account_description" android:title="@string/font_size_account_description"
android:entries="@array/font_entries" android:entries="@array/font_entries"
@ -20,9 +30,12 @@
</PreferenceScreen> </PreferenceScreen>
<PreferenceScreen android:title="@string/font_size_folder_list" android:key="folder_list_fonts"> <PreferenceScreen
android:title="@string/font_size_folder_list"
android:key="folder_list_fonts">
<ListPreference <ListPreference
android:persistent="false"
android:key="folder_name_font" android:key="folder_name_font"
android:title="@string/font_size_folder_name" android:title="@string/font_size_folder_name"
android:entries="@array/font_entries" android:entries="@array/font_entries"
@ -30,6 +43,7 @@
android:dialogTitle="@string/font_size_folder_name" /> android:dialogTitle="@string/font_size_folder_name" />
<ListPreference <ListPreference
android:persistent="false"
android:key="folder_status_font" android:key="folder_status_font"
android:title="@string/font_size_folder_status" android:title="@string/font_size_folder_status"
android:entries="@array/font_entries" android:entries="@array/font_entries"
@ -38,9 +52,12 @@
</PreferenceScreen> </PreferenceScreen>
<PreferenceScreen android:title="@string/font_size_message_list" android:key="message_list_fonts"> <PreferenceScreen
android:title="@string/font_size_message_list"
android:key="message_list_fonts">
<ListPreference <ListPreference
android:persistent="false"
android:key="message_list_subject_font" android:key="message_list_subject_font"
android:title="@string/font_size_message_list_subject" android:title="@string/font_size_message_list_subject"
android:entries="@array/font_entries" android:entries="@array/font_entries"
@ -48,6 +65,7 @@
android:dialogTitle="@string/font_size_message_list_subject" /> android:dialogTitle="@string/font_size_message_list_subject" />
<ListPreference <ListPreference
android:persistent="false"
android:key="message_list_sender_font" android:key="message_list_sender_font"
android:title="@string/font_size_message_list_sender" android:title="@string/font_size_message_list_sender"
android:entries="@array/font_entries" android:entries="@array/font_entries"
@ -55,6 +73,7 @@
android:dialogTitle="@string/font_size_message_list_sender" /> android:dialogTitle="@string/font_size_message_list_sender" />
<ListPreference <ListPreference
android:persistent="false"
android:key="message_list_date_font" android:key="message_list_date_font"
android:title="@string/font_size_message_list_date" android:title="@string/font_size_message_list_date"
android:entries="@array/font_entries" android:entries="@array/font_entries"
@ -63,9 +82,12 @@
</PreferenceScreen> </PreferenceScreen>
<PreferenceScreen android:title="@string/font_size_message_view" android:key="message_view_fonts"> <PreferenceScreen
android:title="@string/font_size_message_view"
android:key="message_view_fonts">
<ListPreference <ListPreference
android:persistent="false"
android:key="message_view_sender_font" android:key="message_view_sender_font"
android:title="@string/font_size_message_view_sender" android:title="@string/font_size_message_view_sender"
android:entries="@array/font_entries" android:entries="@array/font_entries"
@ -73,6 +95,7 @@
android:dialogTitle="@string/font_size_message_view_sender" /> android:dialogTitle="@string/font_size_message_view_sender" />
<ListPreference <ListPreference
android:persistent="false"
android:key="message_view_to_font" android:key="message_view_to_font"
android:title="@string/font_size_message_view_to" android:title="@string/font_size_message_view_to"
android:entries="@array/font_entries" android:entries="@array/font_entries"
@ -80,14 +103,15 @@
android:dialogTitle="@string/font_size_message_view_to" /> android:dialogTitle="@string/font_size_message_view_to" />
<ListPreference <ListPreference
android:persistent="false"
android:key="message_view_cc_font" android:key="message_view_cc_font"
android:title="@string/font_size_message_view_cc" android:title="@string/font_size_message_view_cc"
android:entries="@array/font_entries" android:entries="@array/font_entries"
android:entryValues="@array/font_values" android:entryValues="@array/font_values"
android:dialogTitle="@string/font_size_message_view_cc" /> android:dialogTitle="@string/font_size_message_view_cc" />
<ListPreference <ListPreference
android:persistent="false"
android:key="message_view_subject_font" android:key="message_view_subject_font"
android:title="@string/font_size_message_view_subject" android:title="@string/font_size_message_view_subject"
android:entries="@array/font_entries" android:entries="@array/font_entries"
@ -95,6 +119,7 @@
android:dialogTitle="@string/font_size_message_view_subject" /> android:dialogTitle="@string/font_size_message_view_subject" />
<ListPreference <ListPreference
android:persistent="false"
android:key="message_view_time_font" android:key="message_view_time_font"
android:title="@string/font_size_message_view_time" android:title="@string/font_size_message_view_time"
android:entries="@array/font_entries" android:entries="@array/font_entries"
@ -102,18 +127,23 @@
android:dialogTitle="@string/font_size_message_view_time" /> android:dialogTitle="@string/font_size_message_view_time" />
<ListPreference <ListPreference
android:persistent="false"
android:key="message_view_date_font" android:key="message_view_date_font"
android:title="@string/font_size_message_view_date" android:title="@string/font_size_message_view_date"
android:entries="@array/font_entries" android:entries="@array/font_entries"
android:entryValues="@array/font_values" android:entryValues="@array/font_values"
android:dialogTitle="@string/font_size_message_view_date" /> android:dialogTitle="@string/font_size_message_view_date" />
<ListPreference <ListPreference
android:persistent="false"
android:key="message_view_additional_headers_font" android:key="message_view_additional_headers_font"
android:title="@string/font_size_message_view_additional_headers" android:title="@string/font_size_message_view_additional_headers"
android:entries="@array/font_entries" android:entries="@array/font_entries"
android:entryValues="@array/font_values" android:entryValues="@array/font_values"
android:dialogTitle="@string/font_size_message_view_additional_headers" /> android:dialogTitle="@string/font_size_message_view_additional_headers" />
<ListPreference <ListPreference
android:persistent="false"
android:key="message_view_content_font" android:key="message_view_content_font"
android:title="@string/font_size_message_view_content" android:title="@string/font_size_message_view_content"
android:entries="@array/font_entries_webview" android:entries="@array/font_entries_webview"

258
res/xml/global_preferences.xml
View File

@ -14,155 +14,196 @@
limitations under the License. limitations under the License.
--> -->
<!--
Make sure to add android:persistent="false" to all preferences to disable saving
the preference values to SharedPreferences. We use our own storage mechanism for
the preferences. See com.fsck.k9.preferences.Storage.
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceScreen android:title="@string/display_preferences" android:key="display_preferences"> <PreferenceScreen
android:title="@string/display_preferences"
android:key="display_preferences">
<PreferenceCategory android:title="@string/global_preferences" android:key="global_preferences"> <PreferenceCategory
<ListPreference android:title="@string/global_preferences"
android:key="language" android:key="global_preferences">
android:title="@string/settings_language_label"
android:entries="@array/settings_language_entries"
android:entryValues="@array/settings_language_values"
android:dialogTitle="@string/settings_language_label" />
<ListPreference <ListPreference
android:key="theme" android:persistent="false"
android:title="@string/settings_theme_label" android:key="language"
android:entries="@array/settings_theme_entries" android:title="@string/settings_language_label"
android:entryValues="@array/settings_theme_values" android:entries="@array/settings_language_entries"
android:dialogTitle="@string/settings_theme_label" /> android:entryValues="@array/settings_language_values"
android:dialogTitle="@string/settings_language_label" />
<Preference <ListPreference
android:key="font_size" android:persistent="false"
android:singleLine="true" android:key="theme"
android:title="@string/font_size_settings_title" android:title="@string/settings_theme_label"
android:summary="@string/font_size_settings_description" /> android:entries="@array/settings_theme_entries"
android:entryValues="@array/settings_theme_values"
android:dialogTitle="@string/settings_theme_label" />
<ListPreference <Preference
android:key="dateFormat" android:persistent="false"
android:title="@string/date_format_label" android:key="font_size"
android:entries="@array/date_formats" android:singleLine="true"
android:entryValues="@array/date_formats" android:title="@string/font_size_settings_title"
android:dialogTitle="@string/date_format_label" /> android:summary="@string/font_size_settings_description" />
<ListPreference
android:persistent="false"
android:key="dateFormat"
android:title="@string/date_format_label"
android:entries="@array/date_formats"
android:entryValues="@array/date_formats"
android:dialogTitle="@string/date_format_label" />
<CheckBoxPreference
android:persistent="false"
android:key="animations"
android:title="@string/animations_title"
android:summary="@string/animations_summary" />
</PreferenceCategory>
<PreferenceCategory
android:title="@string/accountlist_preferences"
android:key="accountlist_preferences">
<CheckBoxPreference
android:persistent="false"
android:key="measure_accounts"
android:title="@string/measure_accounts_title"
android:summary="@string/measure_accounts_summary" />
<CheckBoxPreference
android:persistent="false"
android:key="count_search"
android:title="@string/count_search_title"
android:summary="@string/count_search_summary" />
</PreferenceCategory>
<PreferenceCategory
android:title="@string/messagelist_preferences"
android:key="messagelist_preferences">
<CheckBoxPreference
android:persistent="false"
android:key="messagelist_touchable"
android:title="@string/global_settings_touchable_label"
android:summary="@string/global_settings_touchable_summary" />
<CheckBoxPreference
android:persistent="false"
android:key="messagelist_stars"
android:title="@string/global_settings_flag_label"
android:summary="@string/global_settings_flag_summary" />
<CheckBoxPreference
android:persistent="false"
android:key="messagelist_checkboxes"
android:title="@string/global_settings_checkbox_label"
android:summary="@string/global_settings_checkbox_summary" />
<CheckBoxPreference
android:persistent="false"
android:key="messagelist_show_contact_name"
android:title="@string/global_settings_show_contact_name_label"
android:summary="@string/global_settings_show_contact_name_summary" />
<CheckBoxPreference
android:persistent="false"
android:key="messagelist_contact_name_color"
android:title="@string/global_settings_registered_name_color_label"
android:summary="@string/global_settings_registered_name_color_default"
android:dependency="messagelist_show_contact_name" />
</PreferenceCategory>
<PreferenceCategory
android:title="@string/messageview_preferences"
android:key="messageview_preferences">
<CheckBoxPreference
android:persistent="false"
android:key="messageview_fixedwidth_font"
android:title="@string/global_settings_messageview_fixedwidth_label"
android:summary="@string/global_settings_messageview_fixedwidth_summary" />
<CheckBoxPreference
android:persistent="false"
android:key="messageview_mobile_layout"
android:title="@string/settings_messageview_mobile_layout_label"
android:summary="@string/settings_messageview_mobile_layout_summary" />
</PreferenceCategory>
</PreferenceScreen>
<PreferenceScreen
android:title="@string/interaction_preferences"
android:key="interaction_preferences">
<CheckBoxPreference <CheckBoxPreference
android:key="animations" android:persistent="false"
android:title="@string/animations_title"
android:summary="@string/animations_summary" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/accountlist_preferences" android:key="accountlist_preferences">
<CheckBoxPreference
android:key="measure_accounts"
android:title="@string/measure_accounts_title"
android:summary="@string/measure_accounts_summary" />
<CheckBoxPreference
android:key="count_search"
android:title="@string/count_search_title"
android:summary="@string/count_search_summary" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/messagelist_preferences" android:key="messagelist_preferences">
<CheckBoxPreference
android:key="messagelist_touchable"
android:title="@string/global_settings_touchable_label"
android:summary="@string/global_settings_touchable_summary" />
<CheckBoxPreference
android:key="messagelist_stars"
android:title="@string/global_settings_flag_label"
android:summary="@string/global_settings_flag_summary" />
<CheckBoxPreference
android:key="messagelist_checkboxes"
android:title="@string/global_settings_checkbox_label"
android:summary="@string/global_settings_checkbox_summary" />
<CheckBoxPreference
android:key="messagelist_show_contact_name"
android:title="@string/global_settings_show_contact_name_label"
android:summary="@string/global_settings_show_contact_name_summary" />
<CheckBoxPreference
android:key="messagelist_contact_name_color"
android:title="@string/global_settings_registered_name_color_label"
android:summary="@string/global_settings_registered_name_color_default"
android:dependency="messagelist_show_contact_name" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/messageview_preferences" android:key="messageview_preferences">
<CheckBoxPreference
android:key="messageview_fixedwidth_font"
android:title="@string/global_settings_messageview_fixedwidth_label"
android:summary="@string/global_settings_messageview_fixedwidth_summary" />
<CheckBoxPreference
android:key="messageview_mobile_layout"
android:title="@string/settings_messageview_mobile_layout_label"
android:summary="@string/settings_messageview_mobile_layout_summary" />
</PreferenceCategory>
</PreferenceScreen>
<PreferenceScreen android:title="@string/interaction_preferences" android:key="interaction_preferences">
<CheckBoxPreference
android:key="start_integrated_inbox" android:key="start_integrated_inbox"
android:title="@string/start_integrated_inbox_title" android:title="@string/start_integrated_inbox_title"
android:summary="@string/start_integrated_inbox_summary" /> android:summary="@string/start_integrated_inbox_summary" />
<CheckBoxPreference <CheckBoxPreference
android:persistent="false"
android:key="gestures" android:key="gestures"
android:title="@string/gestures_title" android:title="@string/gestures_title"
android:summary="@string/gestures_summary" /> android:summary="@string/gestures_summary" />
<com.fsck.k9.preferences.CheckBoxListPreference <com.fsck.k9.preferences.CheckBoxListPreference
android:persistent="false"
android:key="volumeNavigation" android:key="volumeNavigation"
android:title="@string/volume_navigation_title" android:title="@string/volume_navigation_title"
android:summary="@string/volume_navigation_summary" android:summary="@string/volume_navigation_summary"
android:dialogTitle="@string/volume_navigation_title" android:dialogTitle="@string/volume_navigation_title"
android:positiveButtonText="@android:string/ok" android:positiveButtonText="@android:string/ok"
android:negativeButtonText="@android:string/cancel" android:negativeButtonText="@android:string/cancel" />
/>
<CheckBoxPreference <CheckBoxPreference
android:persistent="false"
android:key="manage_back" android:key="manage_back"
android:title="@string/manage_back_title" android:title="@string/manage_back_title"
android:summary="@string/manage_back_summary" /> android:summary="@string/manage_back_summary" />
<CheckBoxPreference <CheckBoxPreference
android:persistent="false"
android:key="messageview_return_to_list" android:key="messageview_return_to_list"
android:title="@string/global_settings_messageview_return_to_list_label" android:title="@string/global_settings_messageview_return_to_list_label"
android:summary="@string/global_settings_messageview_return_to_list_summary" /> android:summary="@string/global_settings_messageview_return_to_list_summary" />
<CheckBoxPreference <CheckBoxPreference
android:persistent="false"
android:key="messageview_zoom_controls" android:key="messageview_zoom_controls"
android:title="@string/settings_messageview_zoom_controls_label" android:title="@string/settings_messageview_zoom_controls_label"
android:summary="@string/settings_messageview_zoom_controls_summary" /> android:summary="@string/settings_messageview_zoom_controls_summary" />
<com.fsck.k9.preferences.CheckBoxListPreference <com.fsck.k9.preferences.CheckBoxListPreference
android:persistent="false"
android:key="confirm_actions" android:key="confirm_actions"
android:title="@string/global_settings_confirm_actions_title" android:title="@string/global_settings_confirm_actions_title"
android:summary="@string/global_settings_confirm_actions_summary" android:summary="@string/global_settings_confirm_actions_summary"
android:dialogTitle="@string/global_settings_confirm_actions_title" android:dialogTitle="@string/global_settings_confirm_actions_title"
android:positiveButtonText="@android:string/ok" android:positiveButtonText="@android:string/ok"
android:negativeButtonText="@android:string/cancel" android:negativeButtonText="@android:string/cancel" />
/>
</PreferenceScreen> </PreferenceScreen>
<PreferenceScreen android:title="@string/network_preferences" android:key="network_preferences"> <PreferenceScreen
android:title="@string/network_preferences"
android:key="network_preferences">
<ListPreference <ListPreference
android:persistent="false"
android:key="background_ops" android:key="background_ops"
android:title="@string/background_ops_label" android:title="@string/background_ops_label"
android:entries="@array/background_ops_entries" android:entries="@array/background_ops_entries"
@ -171,31 +212,42 @@
</PreferenceScreen> </PreferenceScreen>
<PreferenceScreen android:title="@string/miscellaneous_preferences" android:key="misc_preferences"> <PreferenceScreen
android:title="@string/miscellaneous_preferences"
android:key="misc_preferences">
<CheckBoxPreference <CheckBoxPreference
android:persistent="false"
android:key="use_gallery_bug_workaround" android:key="use_gallery_bug_workaround"
android:title="@string/misc_preferences_attachment_title" android:title="@string/misc_preferences_attachment_title"
android:summary="@string/misc_preferences_attachment_description" /> android:summary="@string/misc_preferences_attachment_description" />
</PreferenceScreen> </PreferenceScreen>
<PreferenceScreen
android:title="@string/privacy_preferences"
android:key="privacy_preferences">
<PreferenceScreen android:title="@string/privacy_preferences" android:key="privacy_preferences">
<CheckBoxPreference <CheckBoxPreference
android:persistent="false"
android:key="privacy_mode" android:key="privacy_mode"
android:title="@string/global_settings_privacy_mode_title" android:title="@string/global_settings_privacy_mode_title"
android:summary="@string/global_settings_privacy_mode_summary"/> android:summary="@string/global_settings_privacy_mode_summary"/>
</PreferenceScreen> </PreferenceScreen>
<PreferenceScreen android:title="@string/debug_preferences" android:key="debug_preferences"> <PreferenceScreen
android:title="@string/debug_preferences"
android:key="debug_preferences">
<CheckBoxPreference <CheckBoxPreference
android:persistent="false"
android:key="debug_logging" android:key="debug_logging"
android:title="@string/debug_enable_debug_logging_title" android:title="@string/debug_enable_debug_logging_title"
android:summary="@string/debug_enable_debug_logging_summary" /> android:summary="@string/debug_enable_debug_logging_summary" />
<CheckBoxPreference <CheckBoxPreference
android:persistent="false"
android:key="sensitive_logging" android:key="sensitive_logging"
android:title="@string/debug_enable_sensitive_logging_title" android:title="@string/debug_enable_sensitive_logging_title"
android:summary="@string/debug_enable_sensitive_logging_summary" /> android:summary="@string/debug_enable_sensitive_logging_summary" />