am 53836e57: Enable "move to" from trash.

* commit '53836e572eb4b402140a02da949f3e3d0ca146ed':
  Enable "move to" from trash.
This commit is contained in:
Andrew Sapperstein 2013-05-16 18:02:49 -07:00 committed by Android Git Automerger
commit 83b4ff7217

View File

@ -2405,6 +2405,7 @@ public class EmailProvider extends ContentProvider {
// For trash, we don't allow undo // For trash, we don't allow undo
if (type == Mailbox.TYPE_TRASH) { if (type == Mailbox.TYPE_TRASH) {
caps = UIProvider.FolderCapabilities.CAN_ACCEPT_MOVED_MESSAGES | caps = UIProvider.FolderCapabilities.CAN_ACCEPT_MOVED_MESSAGES |
UIProvider.FolderCapabilities.ALLOWS_REMOVE_CONVERSATION |
UIProvider.FolderCapabilities.CAN_HOLD_MAIL | UIProvider.FolderCapabilities.CAN_HOLD_MAIL |
UIProvider.FolderCapabilities.DELETE | UIProvider.FolderCapabilities.DELETE |
UIProvider.FolderCapabilities.DELETE_ACTION_FINAL; UIProvider.FolderCapabilities.DELETE_ACTION_FINAL;