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
..
account_settings_preferences.xml	Add cloud search icon to local search result screen. Implement pull-to-remote-search.	2012-09-22 09:40:46 -07:00
folder_settings_preferences.xml	Made sure every PreferenceScreen has an associated key	2012-06-09 01:39:14 +02:00
font_preferences.xml	Made sure every PreferenceScreen has an associated key	2012-06-09 01:39:14 +02:00
global_preferences.xml	option to put the sender of a message above the subject	2012-09-24 19:11:21 -04:00
providers.xml	updated Yahoo! Mail Variants	2012-05-05 00:21:06 -05:00
searchable.xml	k-9's search model isn't a websearch	2010-10-10 19:29:07 +00:00
unread_widget_info.xml	Tweak widget layout	2012-02-13 12:16:20 +01:00