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
assets	SingleMessageView cleanup	2012-04-04 10:04:57 +02:00
compile-only-libs	Add mockito jar for testing.	2011-07-21 17:41:19 -07:00
docs	Added diagram that visualizes activity interactions	2011-10-27 19:13:13 +02:00
images	Add remote search actionbar icons.	2012-09-14 18:23:11 -07:00
libs	Use ADT's magic to include the necessary libraries from lib/	2012-09-08 21:44:49 -07:00
plugins	Update to PullToRefresh 1.4.0 to improve sdk9 compatibility.	2012-09-14 19:48:16 -07:00
res	Merge branch 'imapsearch'	2012-09-25 16:01:52 -07:00
src	Merge branch 'imapsearch'	2012-09-25 16:01:52 -07:00
tests	updated target name "test" in tests/build.xml for Android SDK Tools Revision 20.0.3 / 21 RC4	2012-09-22 09:43:58 -05:00
tools	summary: updated build.xml and tests/build.xml.	2012-06-01 15:41:14 -05:00
.classpath	Use ADT's magic to include the necessary libraries from lib/	2012-09-08 21:44:49 -07:00
.gitignore	summary: updated build.xml and tests/build.xml.	2012-06-01 15:41:14 -05:00
.gitmodules	Add Android-PullToRefresh library as a submodule.	2012-09-12 01:19:57 -07:00
.project	fix the eclipse project name	2010-11-26 03:53:18 +00:00
ActionBarSherlock.iml	IntelliJ IDEA: Dependency updates for PTR.	2012-09-22 09:48:24 -07:00
Android-PullToRefresh.iml	IntelliJ IDEA: Dependency updates for PTR.	2012-09-22 09:48:24 -07:00
Android.mk	Merge ashleywillis' changes in https://github.com/k9mail/k-9/pull/97.	2011-11-14 14:00:15 -08:00
AndroidManifest.xml	Bumped manifest to 4.308	2012-09-24 19:26:55 -04:00
ant.properties	Upgrade to SDK 15	2012-03-11 14:31:35 -05:00
build_common.xml	fixed location of ant-contrib.jar in build_common.xml when running ant from tests/.	2012-06-07 22:57:41 -05:00
build.xml	summary: updated build.xml and tests/build.xml.	2012-06-01 15:41:14 -05:00
HTMLCLEANER_LICENSE	Merge ashleywillis' changes in https://github.com/k9mail/k-9/pull/97.	2011-11-14 14:00:15 -08:00
k9mail.iml	Add Android-PullToRefresh library as a submodule.	2012-09-12 01:19:57 -07:00
k9mail.ipr	IntelliJ IDEA: Dependency updates for PTR.	2012-09-22 09:48:24 -07:00
MODULE_LICENSE_APACHE2	Initial commit - This source code should be EXACTLY what the current version of the 'Email' application in the android repo looks like as of this date.	2008-10-28 01:04:44 +00:00
NOTICE	Initial commit - This source code should be EXACTLY what the current version of the 'Email' application in the android repo looks like as of this date.	2008-10-28 01:04:44 +00:00
proguard.cfg	Upgrade us to android-14 infrastructure	2011-10-27 12:41:24 -04:00
project.properties	add a missing project needed to build with pull to refresh	2012-09-12 10:56:17 -04:00