am 8f580078: Merge "Delete CAN_HOLD_MAIL folder capability." into jb-ub-mail-ur10
* commit '8f580078c51cd4b116d48323c209f7f803ad7f46':
Delete CAN_HOLD_MAIL folder capability.
diff --git a/src/com/android/mail/providers/UIProvider.java b/src/com/android/mail/providers/UIProvider.java
index bc2cc26..30d38c9 100644
--- a/src/com/android/mail/providers/UIProvider.java
+++ b/src/com/android/mail/providers/UIProvider.java
@@ -734,7 +734,8 @@
public static final class FolderCapabilities {
public static final int SYNCABLE = 0x0001;
public static final int PARENT = 0x0002;
- public static final int CAN_HOLD_MAIL = 0x0004;
+ // FEEL FREE TO USE 0x0004 - was previous CAN_HOLD_MAIL but that was true for all
+ // folders so we removed that value
public static final int CAN_ACCEPT_MOVED_MESSAGES = 0x0008;
/**
* For accounts that support archive, this will indicate that this folder supports
diff --git a/src/com/android/mail/providers/protos/mock/MockUiProvider.java b/src/com/android/mail/providers/protos/mock/MockUiProvider.java
index c4cd785..1b1a4f0 100644
--- a/src/com/android/mail/providers/protos/mock/MockUiProvider.java
+++ b/src/com/android/mail/providers/protos/mock/MockUiProvider.java
@@ -294,7 +294,6 @@
Long.valueOf(
FolderCapabilities.SYNCABLE |
FolderCapabilities.PARENT |
- FolderCapabilities.CAN_HOLD_MAIL |
FolderCapabilities.CAN_ACCEPT_MOVED_MESSAGES));
folderMap.put(FolderColumns.UNREAD_COUNT, unread);
folderMap.put(FolderColumns.TOTAL_COUNT, total);
diff --git a/src/com/android/mail/ui/AbstractActivityController.java b/src/com/android/mail/ui/AbstractActivityController.java
index 62702c1..26960c6 100644
--- a/src/com/android/mail/ui/AbstractActivityController.java
+++ b/src/com/android/mail/ui/AbstractActivityController.java
@@ -3139,8 +3139,6 @@
&& event.getClipDescription() != null
&& folder.supportsCapability
(UIProvider.FolderCapabilities.CAN_ACCEPT_MOVED_MESSAGES)
- && folder.supportsCapability
- (UIProvider.FolderCapabilities.CAN_HOLD_MAIL)
&& !mFolder.equals(folder));
}