Merge "Don't clear associated views before snapping them back to position." into jb-ub-mail
diff --git a/src/com/android/mail/ui/SwipeHelper.java b/src/com/android/mail/ui/SwipeHelper.java
index 75cc380..7016469 100644
--- a/src/com/android/mail/ui/SwipeHelper.java
+++ b/src/com/android/mail/ui/SwipeHelper.java
@@ -482,9 +482,6 @@
dismissChild(mCurrView, childSwipedFastEnough ? velocity : 0f);
}
} else {
- // snappity
- mCallback.onDragCancelled(mCurrView);
-
if (mAssociatedViews != null && mAssociatedViews.size() > 1) {
for (SwipeableItemView v : mAssociatedViews) {
snapChild(v, velocity);
@@ -492,6 +489,8 @@
} else {
snapChild(mCurrView, velocity);
}
+ // snappity
+ mCallback.onDragCancelled(mCurrView);
}
}
break;