Joe Steele 1783dd1a63 Merge branch 'master' into tls-client-cert-auth ...

Conflicts:
	res/layout/account_setup_basics.xml
	res/values/strings.xml
	src/com/fsck/k9/activity/setup/AccountSetupBasics.java

2014-08-19 16:19:02 -04:00

..

loader

Remove ActionBarSherlock

2014-06-21 17:09:45 +02:00

misc

Fix contact picture color generation.

2013-11-11 13:31:58 +01:00

setup

Merge branch 'master' into tls-client-cert-auth

2014-08-19 16:19:02 -04:00

AccessibleEmailContentActivity.java

astyle-d

2011-02-26 18:39:06 -06:00

AccountList.java

use more idiomatic String.isEmpty() instead of comparing length to 0

2014-02-15 23:59:24 +01:00

Accounts.java

Compare Enum types with ==, !=

2014-08-18 18:12:39 -04:00

ActivityListener.java

Regularly trigger a title and folder update while activity is resumed.

2013-02-11 15:44:25 +01:00

ChooseFolder.java

Remove ActionBarSherlock

2014-06-21 17:09:45 +02:00

ChooseIdentity.java

use more idiomatic String.isEmpty() instead of comparing length to 0

2014-02-15 23:59:24 +01:00

ColorPickerDialog.java

Add (heavily modified) HoloColorPicker

2013-01-17 09:03:11 +01:00

ConfirmationDialog.java

ant astyle

2011-06-13 19:49:06 -04:00

EditIdentity.java

Removed overrides merely calling super()

2011-12-26 02:28:32 +01:00

EmailAddressList.java

Converted hardcoded strings to constants

2012-04-09 02:02:12 +02:00

FolderInfoHolder.java

Some assorted warning fixes.

2013-09-25 15:20:43 +02:00

FolderList.java

Use isFinishing() instead

2014-08-14 16:22:51 -04:00

FolderListFilter.java

Explicitly use the default locale

2014-04-07 20:35:16 +02:00

InsertableHtmlContent.java

Refactoring: extract a class TextBodyBuilder

2014-05-02 01:33:39 +09:00

K9Activity.java

Remove ActionBarSherlock

2014-06-21 17:09:45 +02:00

K9ActivityCommon.java

MessageView: Theme fix when global and message view theme differ

2013-02-04 19:30:40 +01:00

K9FragmentActivity.java

Remove ActionBarSherlock

2014-06-21 17:09:45 +02:00

K9ListActivity.java

Remove ActionBarSherlock

2014-06-21 17:09:45 +02:00

K9PreferenceActivity.java

Remove ActionBarSherlock

2014-06-21 17:09:45 +02:00

LauncherShortcuts.java

use more idiomatic String.isEmpty() instead of comparing length to 0

2014-02-15 23:59:24 +01:00

ManageIdentities.java

Remove ActionBarSherlock

2014-06-21 17:09:45 +02:00

MessageCompose.java

Remove ActionBarSherlock

2014-06-21 17:09:45 +02:00

MessageInfoHolder.java

Clean up date handling.

2013-02-11 15:19:15 +01:00

MessageList.java

Remove ActionBarSherlock

2014-06-21 17:09:45 +02:00

MessageReference.java

Incorporate review comments.

2013-01-05 13:21:17 +01:00

NotificationDeleteConfirmation.java

Rename plurals to make Transifex happy

2014-01-04 01:44:31 +01:00

Search.java

Add remote IMAP search support.

2012-09-13 09:10:37 -07:00

UnreadWidgetConfiguration.java

Add support for "Unified Inbox" and "All messages" to unread widget

2012-12-08 18:15:34 +01:00

UpgradeDatabases.java

Play store NPE:

2013-07-01 23:32:04 -04:00