Andrew Chen 39e2a973a1 Merge branch 'imapsearch' ... * 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		2012-09-25 16:01:52 -07:00
..
accounts_context.xml	remove lots of duplicate menu ui, particularly cutting down on context menu stuff.	2012-09-12 23:30:27 -07:00
accounts_option.xml	Made "Settings" the last menu item in each activity	2012-09-10 16:48:54 +02:00
disabled_accounts_context.xml	Add dialog to ask for server passwords after import	2011-10-17 04:34:26 +02:00
folder_context.xml	remove lots of duplicate menu ui, particularly cutting down on context menu stuff.	2012-09-12 23:30:27 -07:00
folder_list_option.xml	Got rid of icons in sub-menus	2012-09-10 16:48:55 +02:00
folder_select_option.xml	cleanup; actually use the newly extracted icons	2012-09-09 13:39:14 -07:00
manage_identities_context.xml	Issue 117	2009-06-09 03:11:35 +00:00
manage_identities_option.xml	cleanup; actually use the newly extracted icons	2012-09-09 13:39:14 -07:00
message_compose_option.xml	cleanup; actually use the newly extracted icons	2012-09-09 13:39:14 -07:00
message_list_context.xml	Go back to the old behavior for batch mark as (un)read, (un)flag	2012-09-14 00:34:25 +02:00
message_list_item_context.xml	Display concrete action instead of "Toggle (un)read" & "(Un)star"	2012-09-18 03:33:37 +02:00
message_list_option.xml	Merge branch 'imapsearch'	2012-09-25 16:01:52 -07:00
message_view_option.xml	Display concrete action instead of "Toggle (un)read" & "(Un)star"	2012-09-18 03:33:37 +02:00