Dont show background for items that are not undoing a swipe gesture.

If undoing and it wasnt from a swipe, then have it grow back in
If it was from a swipe, have it slide back in left to right
Conflicts:

	src/com/android/mail/compose/ComposeActivity.java

Change-Id: I6087128620e5db9d5eaa8995300bed8b2ff97911

1 files changed, 2 insertions, 3 deletions

diff --git a/src/com/android/mail/ui/LeaveBehindItem.java b/src/com/android/mail/ui/LeaveBehindItem.java
index 598a5486e..0f937ef7b 100644
--- a/src/com/android/mail/ui/LeaveBehindItem.java
+++ b/src/com/android/mail/ui/LeaveBehindItem.java
@@ -61,12 +61,11 @@ public class LeaveBehindItem extends AnimatingItemView implements OnClickListene
             case R.id.undo_button:
                 if (mAccount.undoUri != null) {
                     // NOTE: We might want undo to return the messages affected,
-                    // in which case
-                    // the resulting cursor might be interesting...
+                    // in which case the resulting cursor might be interesting...
                     // TODO: Use UIProvider.SEQUENCE_QUERY_PARAMETER to indicate
                     // the set of commands to undo
                     mAdapter.clearLeaveBehind(getConversationId());
-                    mAdapter.setUndo(true);
+                    mAdapter.setSwipeUndo(true);
                     mConversationCursor.undo(getContext(), mAccount.undoUri);
                 }
                 break;