mirror of
https://github.com/moparisthebest/k-9
synced 2024-12-18 05:42:15 -05:00
39e2a973a1
* imapsearch: Change settings version to 18 to match what's currrently on master. Handle aborted imap searches by nuking in-progress connections. Move IMAP search into the Folder level. Remove duplicate notification on remote search start. Rename variables changed PREFERENCE_CLOUD_SEARCH_ENABLED from "cloud_search_enabled" to "remote_search_enabled" in activity/setup/AccountSettings.java to resolve FC. Add cloud search icon to local search result screen. Implement pull-to-remote-search. Log remote search exceptions in addition to toasting them. Add settings export for remote search settings. Whitespace; no functional changes. Handle implicit vs. explicit searches in ActionBar home button behavior. Whitespace fix; no functional changes. Add remote search actionbar icons. IMAP Search: log exceptions on remote search, properly dispatch MessageList changes. modified loadMessageForView() to dowload message if neither X_DOWNLOADED_FULL nor X_DOWNLOADED_PARTIAL. Add remote IMAP search support. Conflicts: res/menu/message_list_option.xml res/values/attrs.xml res/values/themes.xml src/com/fsck/k9/activity/MessageList.java src/com/fsck/k9/preferences/Settings.java
85 lines
3.0 KiB
XML
85 lines
3.0 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
|
|
|
|
<item
|
|
android:id="@+id/search_remote"
|
|
android:icon="?attr/iconActionRemoteSearch"
|
|
android:showAsAction="always"
|
|
android:title="@string/action_remote_search"
|
|
android:visible="false"
|
|
/>
|
|
<item
|
|
android:id="@+id/check_mail"
|
|
android:alphabeticShortcut="r"
|
|
android:icon="?attr/iconActionRefresh"
|
|
android:showAsAction="always"
|
|
android:title="@string/check_mail_action"/>
|
|
<item
|
|
android:id="@+id/set_sort"
|
|
android:icon="?attr/iconActionSort"
|
|
android:showAsAction="always"
|
|
android:title="@string/sort_by">
|
|
<menu>
|
|
<item
|
|
android:id="@+id/set_sort_date"
|
|
android:title="@string/sort_by_date"/>
|
|
<item
|
|
android:id="@+id/set_sort_arrival"
|
|
android:title="@string/sort_by_arrival"/>
|
|
<item
|
|
android:id="@+id/set_sort_subject"
|
|
android:title="@string/sort_by_subject"/>
|
|
<item
|
|
android:id="@+id/set_sort_sender"
|
|
android:title="@string/sort_by_sender"/>
|
|
<item
|
|
android:id="@+id/set_sort_flag"
|
|
android:title="@string/sort_by_flag"/>
|
|
<item
|
|
android:id="@+id/set_sort_unread"
|
|
android:title="@string/sort_by_unread"/>
|
|
<item
|
|
android:id="@+id/set_sort_attach"
|
|
android:title="@string/sort_by_attach"/>
|
|
</menu>
|
|
</item>
|
|
<item
|
|
android:id="@+id/compose"
|
|
android:alphabeticShortcut="c"
|
|
android:icon="?attr/iconActionCompose"
|
|
android:showAsAction="always"
|
|
android:title="@string/compose_action"/>
|
|
<item
|
|
android:id="@+id/select_all"
|
|
android:icon="?attr/iconMenuSelectAll"
|
|
android:showAsAction="never"
|
|
android:title="@string/batch_select_all"/>
|
|
<item
|
|
android:id="@+id/send_messages"
|
|
android:alphabeticShortcut="r"
|
|
android:icon="?attr/iconActionRefresh"
|
|
android:showAsAction="never"
|
|
android:title="@string/send_messages_action"/>
|
|
<item
|
|
android:id="@+id/expunge"
|
|
android:showAsAction="never"
|
|
android:title="@string/expunge_action"/>
|
|
<item
|
|
android:id="@+id/settings"
|
|
android:icon="?attr/iconMenuPreferences"
|
|
android:showAsAction="never"
|
|
android:title="@string/preferences_action">
|
|
<menu>
|
|
<item
|
|
android:id="@+id/folder_settings"
|
|
android:title="@string/folder_settings_action"/>
|
|
<item
|
|
android:id="@+id/account_settings"
|
|
android:title="@string/account_settings_action"/>
|
|
<item
|
|
android:id="@+id/app_settings"
|
|
android:title="@string/global_settings_action"/>
|
|
</menu>
|
|
</item>
|
|
|
|
</menu> |