commit 7ee089ea2ef96e31504e88637b5f3b0969b3c7c1
author Scott Kennedy <skennedy@google.com> Mon Mar 25 17:05:44 2013 -0400
committer Paul Westbrook <pwestbro@google.com> Fri Apr 19 11:21:14 2013 -0700
tree 8112b09a58e1a4350af2a46519ef87617e304baf
parent 1b56a67396e40b65e15743bcf8ccce9a623b2f2c

Add Empty trash/spam option

Bug: 4559378
Change-Id: I8dc5715a5f14f9fd6e8962ab665c4c25f3c64302

src/com/android/mail/ui/MailActionBarView.java

diff --git a/src/com/android/mail/ui/MailActionBarView.java b/src/com/android/mail/ui/MailActionBarView.java
index 3fcda76..067fd20 100644
--- a/src/com/android/mail/ui/MailActionBarView.java
+++ b/src/com/android/mail/ui/MailActionBarView.java
@@ -53,6 +53,7 @@
 import com.android.mail.providers.UIProvider;
 import com.android.mail.providers.UIProvider.AccountCapabilities;
 import com.android.mail.providers.UIProvider.FolderCapabilities;
+import com.android.mail.providers.UIProvider.FolderType;
 import com.android.mail.utils.LogTag;
 import com.android.mail.utils.LogUtils;
 import com.android.mail.utils.Utils;
@@ -97,6 +98,8 @@
     private MenuItem mSendFeedbackItem;
     private MenuItem mRefreshItem;
     private MenuItem mFolderSettingsItem;
+    private MenuItem mEmptyTrashItem;
+    private MenuItem mEmptySpamItem;
     private View mRefreshActionView;
     /** True if the current device is a tablet, false otherwise. */
     protected final boolean mIsOnTablet;
@@ -234,6 +237,8 @@
         mSendFeedbackItem = menu.findItem(R.id.feedback_menu_item);
         mRefreshItem = menu.findItem(R.id.refresh);
         mFolderSettingsItem = menu.findItem(R.id.folder_options);
+        mEmptyTrashItem = menu.findItem(R.id.empty_trash);
+        mEmptySpamItem = menu.findItem(R.id.empty_spam);
         return true;
     }
 
@@ -401,6 +406,16 @@
             mFolderSettingsItem.setVisible(mFolder != null
                     && mFolder.supportsCapability(FolderCapabilities.SUPPORTS_SETTINGS));
         }
+        if (mEmptyTrashItem != null) {
+            mEmptyTrashItem.setVisible(mAccount != null && mFolder != null
+                    && mAccount.supportsCapability(AccountCapabilities.EMPTY_TRASH)
+                    && mFolder.isTrash());
+        }
+        if (mEmptySpamItem != null) {
+            mEmptySpamItem.setVisible(mAccount != null && mFolder != null
+                    && mAccount.supportsCapability(AccountCapabilities.EMPTY_SPAM)
+                    && mFolder.isType(FolderType.SPAM));
+        }
 
         switch (mMode) {
             case ViewMode.CONVERSATION: