commit a8381a29c8f7b3136692446e26dcf03c22a115b5
author Mindy Pereira <mindyp@google.com> Thu May 24 15:29:47 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 24 15:29:47 2012 -0700
tree 367f861faae40ff83552f9cf3811e39663dacccf
parent 04ba80fafd4c8c4473443a23cc4e0d2c28d2542b
parent 3cb28b5e1598f74dedbdb87b187d9bd7e132ff0f

Merge "Enable undo for accounts that support it." into jb-ub-mail

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

diff --git a/src/com/android/mail/ui/AbstractActivityController.java b/src/com/android/mail/ui/AbstractActivityController.java
index 7555689..5747999 100644
--- a/src/com/android/mail/ui/AbstractActivityController.java
+++ b/src/com/android/mail/ui/AbstractActivityController.java
@@ -64,6 +64,7 @@
 import com.android.mail.providers.Settings;
 import com.android.mail.providers.SuggestionsProvider;
 import com.android.mail.providers.UIProvider;
+import com.android.mail.providers.UIProvider.AccountCapabilities;
 import com.android.mail.providers.UIProvider.AccountCursorExtraKeys;
 import com.android.mail.providers.UIProvider.ConversationColumns;
 import com.android.mail.providers.UIProvider.FolderCapabilities;
@@ -1460,8 +1461,7 @@
             }
             // Certain actions force a return to list.
             boolean forceReturnToList = false;
-            // Enable undo for batch operations. Some actions disable the undo ability.
-            boolean undoEnabled = mIsSelectedSet;
+            boolean undoEnabled = mAccount.supportsCapability(AccountCapabilities.UNDO);
 
             // Are we destroying the currently shown conversation? Show the next one.
             if (LogUtils.isLoggable(LOG_TAG, LogUtils.DEBUG)){