moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-08-13 17:03:48 -04:00
Code Issues Releases Wiki Activity

Formatting cleanup. No functional changes.

Browse Source
This commit is contained in:
cketti 2012-09-10 15:58:19 +02:00
parent 185d6b8538
commit 078e5dd867
3 changed files with 127 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
res/menu/accounts_option.xml
View File

@ -1,51 +1,51 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"> <menu xmlns:android="http://schemas.android.com/apk/res/android" >
<item <item
android:id="@+id/check_mail" android:id="@+id/check_mail"
android:alphabeticShortcut="r" android:alphabeticShortcut="r"
android:title="@string/check_mail_action" android:icon="?attr/iconActionRefresh"
android:icon="?attr/iconActionRefresh" android:showAsAction="always"
android:showAsAction="always" android:title="@string/check_mail_action"/>
/> <item
<item android:id="@+id/search"
android:id="@+id/search" android:icon="?attr/iconActionSearch"
android:title="@string/search_action" android:showAsAction="always"
android:icon="?attr/iconActionSearch" android:title="@string/search_action"/>
android:showAsAction="always" <item
/> android:id="@+id/compose"
<item
android:id="@+id/compose"
android:alphabeticShortcut="c" android:alphabeticShortcut="c"
android:title="@string/compose_action" android:icon="?attr/iconActionCompose"
android:icon="?attr/iconActionCompose" android:showAsAction="always"
android:showAsAction="always" android:title="@string/compose_action"/>
/> <item
<item android:id="@+id/add_new_account"
android:id="@+id/add_new_account" android:icon="?attr/iconMenuAdd"
android:title="@string/add_account_action" android:title="@string/add_account_action"/>
android:icon="?attr/iconMenuAdd"
/>
<item <item
android:id="@+id/about" android:id="@+id/about"
android:title="@string/about_action"
android:icon="@android:drawable/ic_menu_info_details" android:icon="@android:drawable/ic_menu_info_details"
/> android:title="@string/about_action"/>
<!-- <!--
<item android:id="@+id/search" <item android:id="@+id/search"
android:title="@string/search_action" /> android:title="@string/search_action" />
--> -->
<item android:id="@+id/edit_prefs" <item
android:title="@string/preferences_action" android:id="@+id/edit_prefs"
android:icon="@android:drawable/ic_menu_preferences" android:icon="@android:drawable/ic_menu_preferences"
android:showAsAction="never" android:showAsAction="never"
/> android:title="@string/preferences_action"/>
<item android:id="@+id/import_export" <item
android:title="@string/import_export_action"> android:id="@+id/import_export"
android:title="@string/import_export_action">
<menu> <menu>
<item android:id="@+id/export_all" <item
android:title="@string/settings_export_all" /> android:id="@+id/export_all"
<item android:id="@+id/import_settings" android:title="@string/settings_export_all"/>
android:title="@string/settings_import" /> <item
android:id="@+id/import_settings"
android:title="@string/settings_import"/>
</menu> </menu>
</item> </item>
</menu>
</menu>

137
res/menu/folder_list_option.xml
View File

@ -1,95 +1,82 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"> <menu xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:id="@+id/check_mail" <item
android:id="@+id/check_mail"
android:alphabeticShortcut="r" android:alphabeticShortcut="r"
android:title="@string/check_mail_action" android:icon="?attr/iconActionRefresh"
android:icon="?attr/iconActionRefresh" android:showAsAction="always"
android:showAsAction="always" android:title="@string/check_mail_action"/>
/> <item
<item android:id="@+id/compose"
android:id="@+id/compose"
android:alphabeticShortcut="c" android:alphabeticShortcut="c"
android:title="@string/compose_action"
android:icon="?attr/iconActionCompose" android:icon="?attr/iconActionCompose"
android:showAsAction="always" android:showAsAction="always"
/> android:title="@string/compose_action"/>
<item <item
android:title="@string/folder_list_display_mode_label"
android:icon="@drawable/ic_show_folders" android:icon="@drawable/ic_show_folders"
> android:title="@string/folder_list_display_mode_label">
<menu> <menu>
<item <item
android:id="@+id/display_all" android:id="@+id/display_all"
android:title="@string/folder_list_display_mode_all" android:icon="?attr/iconMenuClear"
android:icon="?attr/iconMenuClear" android:title="@string/folder_list_display_mode_all"/>
/> <item
<item android:id="@+id/display_1st_class"
android:id="@+id/display_1st_class" android:icon="?attr/iconMenuClear"
android:title="@string/folder_list_display_mode_first_class" android:title="@string/folder_list_display_mode_first_class"/>
android:icon="?attr/iconMenuClear" <item
/> android:id="@+id/display_1st_and_2nd_class"
<item android:icon="?attr/iconMenuClear"
android:id="@+id/display_1st_and_2nd_class" android:title="@string/folder_list_display_mode_first_and_second_class"/>
android:title="@string/folder_list_display_mode_first_and_second_class" <item
android:icon="?attr/iconMenuClear" android:id="@+id/display_not_second_class"
/> android:icon="?attr/iconMenuClear"
<item android:title="@string/folder_list_display_mode_not_second_class"/>
android:id="@+id/display_not_second_class" <item
android:title="@string/folder_list_display_mode_not_second_class" android:id="@+id/list_folders"
android:icon="?attr/iconMenuClear" android:icon="?attr/iconMenuRefresh"
/> android:title="@string/refresh_folders_action"/>
<item <item
android:id="@+id/list_folders" android:id="@+id/filter_folders"
android:title="@string/refresh_folders_action" android:icon="?attr/iconMenuSearch"
android:icon="?attr/iconMenuRefresh" android:title="@string/filter_folders_action"/>
/>
<item
android:id="@+id/filter_folders"
android:title="@string/filter_folders_action"
android:icon="?attr/iconMenuSearch"
/>
</menu> </menu>
</item> </item>
<item <item
android:id="@+id/empty_trash" android:id="@+id/empty_trash"
android:alphabeticShortcut="e" android:alphabeticShortcut="e"
android:title="@string/empty_trash_action" android:icon="?attr/iconMenuDelete"
android:icon="?attr/iconMenuDelete" android:title="@string/empty_trash_action"/>
/>
<item <item
android:id="@+id/settings" android:id="@+id/settings"
android:title="@string/preferences_action"
android:icon="?attr/iconMenuPreferences" android:icon="?attr/iconMenuPreferences"
android:showAsAction="never"> android:showAsAction="never"
android:title="@string/preferences_action">
<menu> <menu>
<item <item
android:id="@+id/account_settings" android:id="@+id/account_settings"
android:title="@string/account_settings_action" android:icon="@android:drawable/ic_menu_preferences"
android:icon="@android:drawable/ic_menu_preferences" android:title="@string/account_settings_action"/>
/> <item
<item android:id="@+id/app_settings" android:id="@+id/app_settings"
android:title="@string/global_settings_action" android:icon="@android:drawable/ic_menu_preferences"
android:icon="@android:drawable/ic_menu_preferences" android:title="@string/global_settings_action"/>
/>
</menu> </menu>
</item> </item>
<item <item
android:id="@+id/send_messages" android:id="@+id/send_messages"
android:title="@string/send_messages_action" android:icon="?attr/iconMenuRefresh"
android:icon="?attr/iconMenuRefresh" android:title="@string/send_messages_action"/>
/> <item
<item android:id="@+id/advanced" android:id="@+id/advanced"
android:title="@string/advanced"> android:title="@string/advanced">
<menu> <menu>
<item <item
android:id="@+id/compact" android:id="@+id/compact"
android:title="@string/compact_action" android:icon="?attr/iconMenuCompact"
android:icon="?attr/iconMenuCompact" android:title="@string/compact_action"/>
/> </menu>
</menu>
</item> </item>
</menu>
</menu>

66
res/menu/message_list_option.xml
View File

@ -1,100 +1,86 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"> <menu xmlns:android="http://schemas.android.com/apk/res/android" >
<item
<item
android:id="@+id/compose" android:id="@+id/compose"
android:alphabeticShortcut="c" android:alphabeticShortcut="c"
android:title="@string/compose_action"
android:icon="?attr/iconActionCompose" android:icon="?attr/iconActionCompose"
android:showAsAction="always" android:showAsAction="always"
/> android:title="@string/compose_action"/>
<item <item
android:id="@+id/set_sort" android:id="@+id/set_sort"
android:title="@string/sort_by"
android:icon="?attr/iconActionSort" android:icon="?attr/iconActionSort"
android:showAsAction="always" > android:showAsAction="always"
<menu> android:title="@string/sort_by">
<menu>
<item <item
android:id="@+id/set_sort_date" android:id="@+id/set_sort_date"
android:title="@string/sort_by_date" android:title="@string/sort_by_date"/>
/>
<item <item
android:id="@+id/set_sort_arrival" android:id="@+id/set_sort_arrival"
android:title="@string/sort_by_arrival" android:title="@string/sort_by_arrival"/>
/>
<item <item
android:id="@+id/set_sort_subject" android:id="@+id/set_sort_subject"
android:title="@string/sort_by_subject" android:title="@string/sort_by_subject"/>
/>
<item <item
android:id="@+id/set_sort_sender" android:id="@+id/set_sort_sender"
android:title="@string/sort_by_sender" android:title="@string/sort_by_sender"/>
/>
<item <item
android:id="@+id/set_sort_flag" android:id="@+id/set_sort_flag"
android:title="@string/sort_by_flag" android:title="@string/sort_by_flag"/>
/>
<item <item
android:id="@+id/set_sort_unread" android:id="@+id/set_sort_unread"
android:title="@string/sort_by_unread" android:title="@string/sort_by_unread"/>
/>
<item <item
android:id="@+id/set_sort_attach" android:id="@+id/set_sort_attach"
android:title="@string/sort_by_attach" android:title="@string/sort_by_attach"/>
/>
</menu> </menu>
</item> </item>
<item <item
android:id="@+id/select_all" android:id="@+id/select_all"
android:title="@string/batch_select_all"
android:icon="?attr/iconMenuSelectAll" android:icon="?attr/iconMenuSelectAll"
android:showAsAction="never" android:showAsAction="never"
/> android:title="@string/batch_select_all"/>
<item <item
android:id="@+id/send_messages" android:id="@+id/send_messages"
android:alphabeticShortcut="r" android:alphabeticShortcut="r"
android:title="@string/send_messages_action"
android:icon="?attr/iconActionRefresh" android:icon="?attr/iconActionRefresh"
android:showAsAction="never" android:showAsAction="never"
/> android:title="@string/send_messages_action"/>
<item <item
android:id="@+id/check_mail" android:id="@+id/check_mail"
android:alphabeticShortcut="r" android:alphabeticShortcut="r"
android:title="@string/check_mail_action"
android:icon="?attr/iconActionRefresh" android:icon="?attr/iconActionRefresh"
android:showAsAction="always" android:showAsAction="always"
/> android:title="@string/check_mail_action"/>
<item <item
android:id="@+id/mark_all_as_read" android:id="@+id/mark_all_as_read"
android:title="@string/mark_all_as_read_action"
android:icon="?attr/iconMenuInbox" android:icon="?attr/iconMenuInbox"
android:showAsAction="never" android:showAsAction="never"
/> android:title="@string/mark_all_as_read_action"/>
<item <item
android:id="@+id/settings" android:id="@+id/settings"
android:title="@string/preferences_action"
android:icon="?attr/iconMenuPreferences" android:icon="?attr/iconMenuPreferences"
android:showAsAction="never"> android:showAsAction="never"
android:title="@string/preferences_action">
<menu> <menu>
<item <item
android:id="@+id/folder_settings" android:id="@+id/folder_settings"
android:title="@string/folder_settings_action"
android:icon="?attr/iconMenuPreferences" android:icon="?attr/iconMenuPreferences"
/> android:title="@string/folder_settings_action"/>
<item <item
android:id="@+id/account_settings" android:id="@+id/account_settings"
android:title="@string/account_settings_action"
android:icon="@android:drawable/ic_menu_preferences" android:icon="@android:drawable/ic_menu_preferences"
/> android:title="@string/account_settings_action"/>
<item <item
android:id="@+id/app_settings" android:id="@+id/app_settings"
android:title="@string/global_settings_action"
android:icon="@android:drawable/ic_menu_preferences" android:icon="@android:drawable/ic_menu_preferences"
/> android:title="@string/global_settings_action"/>
</menu> </menu>
</item> </item>
<item <item
android:id="@+id/expunge" android:id="@+id/expunge"
android:title="@string/expunge_action"
android:showAsAction="never" android:showAsAction="never"
/> android:title="@string/expunge_action"/>
</menu>
</menu>