Explicitly call out the name of the folder/label being removed.

Fixes b/On swipe change copy for Remove from label to Remove from [labelname]

Also, that's not a not =P if it is animating, skip, otherwise, refresh
Change-Id: I450033cac8adf2b95e9ed101e1a4651f708e5ac0

1 files changed, 3 insertions, 2 deletions

diff --git a/src/com/android/mail/ui/LeaveBehindItem.java b/src/com/android/mail/ui/LeaveBehindItem.java
index 213aac5c3..3837581bc 100644
--- a/src/com/android/mail/ui/LeaveBehindItem.java
+++ b/src/com/android/mail/ui/LeaveBehindItem.java
@@ -36,6 +36,7 @@ import com.android.mail.browse.ConversationCursor;
 import com.android.mail.browse.ConversationItemViewCoordinates;
 import com.android.mail.providers.Account;
 import com.android.mail.providers.Conversation;
+import com.android.mail.providers.Folder;
 import com.google.common.collect.ImmutableList;
 
 public class LeaveBehindItem extends LinearLayout implements OnClickListener,
@@ -77,14 +78,14 @@ public class LeaveBehindItem extends LinearLayout implements OnClickListener,
     }
 
     public void bindOperations(int position, Account account, AnimatedAdapter adapter,
-            ToastBarOperation undoOp, Conversation target) {
+            ToastBarOperation undoOp, Conversation target, Folder folder) {
         mUndoOp = undoOp;
         mAccount = account;
         mAdapter = adapter;
         mConversationCursor = (ConversationCursor) adapter.getCursor();
         setData(target);
         ((TextView) findViewById(R.id.undo_descriptionview)).setText(Html.fromHtml(mUndoOp
-                .getSingularDescription(getContext())));
+                .getSingularDescription(getContext(), folder)));
         ((RelativeLayout) findViewById(R.id.undo_button)).setOnClickListener(this);
     }