commit 77c3e1bfdc9d14d68440c78386b700cedd0ce65a
author mindyp <mindyp@google.com> Tue Sep 11 14:05:02 2012 -0700
committer mindyp <mindyp@google.com> Tue Sep 11 14:07:08 2012 -0700
tree ec1fbaafef10380d0e688c47e97ae5d981cc2215
parent 2b24e995cfcdb6ab0579b2fbcccb399a53632395

Swipe should delete in spam

Fixes b/7147157 Swiping on Spam should delete not remove from label

Change-Id: I198a76d9ef516f12ccb5509e4fbb4f22e672320e

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

diff --git a/src/com/android/mail/ui/ConversationListFragment.java b/src/com/android/mail/ui/ConversationListFragment.java
index fb5e2d7..7cb6e67 100644
--- a/src/com/android/mail/ui/ConversationListFragment.java
+++ b/src/com/android/mail/ui/ConversationListFragment.java
@@ -48,6 +48,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.providers.UIProvider.Swipe;
 import com.android.mail.ui.SwipeableListView.SwipeCompleteListener;
 import com.android.mail.ui.ViewMode.ModeChangeListener;
@@ -582,7 +583,8 @@
             mListView.enableSwipe(false);
         } else {
             int action;
-            if (ConversationListContext.isSearchResult(mViewContext)) {
+            if (ConversationListContext.isSearchResult(mViewContext)
+                    || (mFolder != null && mFolder.type == FolderType.SPAM)) {
                 action = R.id.delete;
             } else if (mFolder == null) {
                 action = R.id.remove_folder;