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
..
drawable	added improvements suggested by achen	2012-08-30 17:47:58 +02:00
drawable-hdpi	Merge branch 'imapsearch'	2012-09-25 16:01:52 -07:00
drawable-ldpi	Merge branch 'imapsearch'	2012-09-25 16:01:52 -07:00
drawable-mdpi	Merge branch 'imapsearch'	2012-09-25 16:01:52 -07:00
drawable-xhdpi	Merge branch 'imapsearch'	2012-09-25 16:01:52 -07:00
layout	Merge branch 'imapsearch'	2012-09-25 16:01:52 -07:00
layout-land	remove the old optimized-for-g1 message_list_item	2012-09-10 09:42:25 -04:00
menu	Merge branch 'imapsearch'	2012-09-25 16:01:52 -07:00
values	Merge branch 'imapsearch'	2012-09-25 16:01:52 -07:00
values-ca	Removed 'compact layout' for now	2012-09-18 03:43:54 +02:00
values-cs	Removed 'compact layout' for now	2012-09-18 03:43:54 +02:00
values-da	Removed 'compact layout' for now	2012-09-18 03:43:54 +02:00
values-de	Removed 'compact layout' for now	2012-09-18 03:43:54 +02:00
values-el	Removed 'compact layout' for now	2012-09-18 03:43:54 +02:00
values-es	Removed 'compact layout' for now	2012-09-18 03:43:54 +02:00
values-fi	Finnish translation updated.	2012-09-25 10:54:11 -07:00
values-fr	Removed 'compact layout' for now	2012-09-18 03:43:54 +02:00
values-fr-rCA	Removed unused stuff	2012-05-24 06:17:48 +02:00
values-gl	Removed 'compact layout' for now	2012-09-18 03:43:54 +02:00
values-hu	Removed 'compact layout' for now	2012-09-18 03:43:54 +02:00
values-it	Removed 'compact layout' for now	2012-09-18 03:43:54 +02:00
values-iw	Removed 'compact layout' for now	2012-09-18 03:43:54 +02:00
values-ja	Removed 'compact layout' for now	2012-09-18 03:43:54 +02:00
values-ko	Removed 'compact layout' for now	2012-09-18 03:43:54 +02:00
values-nl	Removed 'compact layout' for now	2012-09-18 03:43:54 +02:00
values-pl	Removed 'compact layout' for now	2012-09-18 03:43:54 +02:00
values-pt-rBR	Removed 'compact layout' for now	2012-09-18 03:43:54 +02:00
values-ru	Removed 'compact layout' for now	2012-09-18 03:43:54 +02:00
values-sv	Removed 'compact layout' for now	2012-09-18 03:43:54 +02:00
values-tr	Removed 'compact layout' for now	2012-09-18 03:43:54 +02:00
values-uk	Removed 'compact layout' for now	2012-09-18 03:43:54 +02:00
values-v11	Display a dark-themed "Send as" dialog when using the dark theme on HC+	2012-09-16 03:24:40 +02:00
values-zh-rCN	Removed 'compact layout' for now	2012-09-18 03:43:54 +02:00
values-zh-rTW	Removed 'compact layout' for now	2012-09-18 03:43:54 +02:00
xml	Merge branch 'imapsearch'	2012-09-25 16:01:52 -07:00