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
..
arrays.xml	Whitespace; no functional changes.	2012-09-18 19:43:56 -07:00
attrs.xml	Merge branch 'imapsearch'	2012-09-25 16:01:52 -07:00
colors.xml	Removed unused stuff	2012-05-24 06:17:48 +02:00
constants.xml	Extracted some strings to constants.xml	2012-04-23 15:05:29 +00:00
dimensions.xml	Imported a variant of http://code.google.com/p/android-color-picker/ into k-9	2010-11-08 02:21:32 +00:00
ids.xml	Issue 2296 Spam message	2011-04-01 05:54:51 +08:00
strings.xml	Merge branch 'imapsearch'	2012-09-25 16:01:52 -07:00
styles.xml	Fix a display bug by extending the system themes	2012-04-11 03:26:45 +02:00
themes.xml	Merge branch 'imapsearch'	2012-09-25 16:01:52 -07:00