moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-12-24 16:48:50 -05:00
Code Issues Releases Wiki Activity

Unify some Account Settings into General Settings and Reading Mail settings

Browse Source 
Eliminate the "Interaction" account setting category, which only had one setting under it.
This commit is contained in:
Andrew Chen 2012-12-18 16:06:13 -08:00
parent 26e5d89ddd
commit c530a00e5b
2 changed files with 18 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/strings.xml
View File

@ -505,7 +505,7 @@ Please submit bug reports, contribute new features and ask questions at
<string name="account_settings_notification_opens_unread_summary">Searches for unread messages when Notification is opened</string> <string name="account_settings_notification_opens_unread_summary">Searches for unread messages when Notification is opened</string>
<string name="account_settings_notification_unread_count_label">Show unread count</string> <string name="account_settings_notification_unread_count_label">Show unread count</string>
<string name="account_settings_notification_unread_count_summary">Show the number of unread messages in the notification bar.</string> <string name="account_settings_notification_unread_count_summary">Show the number of unread messages in the notification bar.</string>
<string name="account_settings_mark_message_as_read_on_view_label">Mark message as read when opening</string> <string name="account_settings_mark_message_as_read_on_view_label">Mark as read when opened</string>
<string name="account_settings_mark_message_as_read_on_view_summary">Mark a message as read when it is opened for viewing</string> <string name="account_settings_mark_message_as_read_on_view_summary">Mark a message as read when it is opened for viewing</string>
<string name="account_settings_show_pictures_label">Always show images</string> <string name="account_settings_show_pictures_label">Always show images</string>
@ -540,6 +540,7 @@ Please submit bug reports, contribute new features and ask questions at
<string name="account_settings_quote_style_header">Header (like Outlook)</string> <string name="account_settings_quote_style_header">Header (like Outlook)</string>
<string name="account_settings_general_title">General settings</string> <string name="account_settings_general_title">General settings</string>
<string name="account_settings_reading_mail">Reading mail</string>
<string name="account_settings_display_prefs_title">Display</string> <string name="account_settings_display_prefs_title">Display</string>
<string name="account_settings_sync">Fetching mail</string> <string name="account_settings_sync">Fetching mail</string>
<string name="account_settings_folders">Folders</string> <string name="account_settings_folders">Folders</string>

50
res/xml/account_settings_preferences.xml
View File

@ -45,44 +45,26 @@
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> <Preference
android:persistent="false"
<PreferenceScreen android:key="chip_color"
android:title="@string/account_settings_display_prefs_title" android:singleLine="true"
android:key="display"> android:title="@string/account_settings_color_label"
android:summary="@string/account_settings_color_summary" />
<PreferenceCategory
android:title="@string/account_settings_message_lists"
android:key="lists">
<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
android:title="@string/account_settings_message_view"
android:key="view">
<ListPreference
android:persistent="false"
android:key="show_pictures_enum"
android:title="@string/account_settings_show_pictures_label"
android:entries="@array/account_settings_show_pictures_entries"
android:entryValues="@array/account_settings_show_pictures_values"
android:dialogTitle="@string/account_settings_show_pictures_label" />
</PreferenceCategory>
</PreferenceScreen> </PreferenceScreen>
<PreferenceScreen <PreferenceScreen
android:title="@string/interaction_preferences" android:title="@string/account_settings_reading_mail"
android:key="interaction"> android:key="reading_mail">
<ListPreference
android:persistent="false"
android:key="show_pictures_enum"
android:title="@string/account_settings_show_pictures_label"
android:entries="@array/account_settings_show_pictures_entries"
android:entryValues="@array/account_settings_show_pictures_values"
android:dialogTitle="@string/account_settings_show_pictures_label" />
<CheckBoxPreference <CheckBoxPreference
android:persistent="false" android:persistent="false"