Merge "Use AbsoluteSizeSpan instead of RelativeSizeSpan" into ub-mail-master
diff --git a/src/com/android/mail/providers/Account.java b/src/com/android/mail/providers/Account.java
index 02f89c7..46c927d 100644
--- a/src/com/android/mail/providers/Account.java
+++ b/src/com/android/mail/providers/Account.java
@@ -723,7 +723,7 @@
mReplyFroms = Lists.newArrayList();
// skip if sending is unsupported
- if (supportsCapability(AccountCapabilities.SENDING_UNAVAILABLE)) {
+ if (supportsCapability(AccountCapabilities.VIRTUAL_ACCOUNT)) {
return mReplyFroms;
}
diff --git a/src/com/android/mail/providers/UIProvider.java b/src/com/android/mail/providers/UIProvider.java
index cadd222..43b37fe 100644
--- a/src/com/android/mail/providers/UIProvider.java
+++ b/src/com/android/mail/providers/UIProvider.java
@@ -296,9 +296,9 @@
*/
public static final int INITIAL_CONVERSATION_LIMIT = 0x40000;
/**
- * Whether the account cannot be used for sending
+ * Whether the account is not a real account, i.e. Combined View
*/
- public static final int SENDING_UNAVAILABLE = 0x80000;
+ public static final int VIRTUAL_ACCOUNT = 0x80000;
/**
* Whether the account supports discarding drafts from a conversation. This should be
* removed when all providers support this capability
diff --git a/src/com/android/mail/ui/settings/MailPreferenceActivity.java b/src/com/android/mail/ui/settings/MailPreferenceActivity.java
index 4664790..168d72b 100644
--- a/src/com/android/mail/ui/settings/MailPreferenceActivity.java
+++ b/src/com/android/mail/ui/settings/MailPreferenceActivity.java
@@ -30,6 +30,7 @@
import com.android.mail.providers.Account;
import com.android.mail.providers.MailAppProvider;
import com.android.mail.providers.UIProvider;
+import com.android.mail.providers.UIProvider.AccountCapabilities;
import com.google.common.annotations.VisibleForTesting;
import java.lang.ref.WeakReference;
@@ -99,7 +100,8 @@
if (mAccountsCursor != null && mAccountsCursor.moveToFirst()) {
do {
final Account account = new Account(mAccountsCursor);
- if (!TextUtils.isEmpty(account.getEmailAddress())) {
+ // TODO: This will no longer be needed when the Combined view is moved to Unified
+ if (!account.supportsCapability(AccountCapabilities.VIRTUAL_ACCOUNT)) {
final Header header = new Header();
if (TextUtils.isEmpty(account.getDisplayName()) ||
TextUtils.equals(account.getDisplayName(), account.getEmailAddress())) {