Merge "Remove shadow from leave behind item." into jb-ub-mail
diff --git a/res/layout/background.xml b/res/layout/background.xml
index 9ee618c..527c147 100644
--- a/res/layout/background.xml
+++ b/res/layout/background.xml
@@ -19,4 +19,4 @@
android:id="@+id/background"
android:layout_width="match_parent"
android:minHeight="@dimen/conversation_item_height"
- android:background="@drawable/swiped_bg" />
\ No newline at end of file
+ android:background="@color/swiped_bg_color" />
\ No newline at end of file
diff --git a/res/layout/swipe_leavebehind.xml b/res/layout/swipe_leavebehind.xml
index 3362286..9406d03 100644
--- a/res/layout/swipe_leavebehind.xml
+++ b/res/layout/swipe_leavebehind.xml
@@ -18,7 +18,7 @@
<com.android.mail.ui.LeaveBehindItem xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@drawable/swiped_bg"
+ android:background="@color/swiped_bg_color"
android:minHeight="@dimen/conversation_item_height" >
<LinearLayout
diff --git a/src/com/android/mail/ui/LeaveBehindItem.java b/src/com/android/mail/ui/LeaveBehindItem.java
index b640581..ebd730d 100644
--- a/src/com/android/mail/ui/LeaveBehindItem.java
+++ b/src/com/android/mail/ui/LeaveBehindItem.java
@@ -198,8 +198,6 @@
ObjectAnimator height = ObjectAnimator.ofInt(this, "animatedHeight", start, end);
mAnimatedHeight = start;
mWidth = getMeasuredWidth();
- // Use a color instead of a 9 patch to avoid weird artifacts when animating.
- setBackgroundColor(sSwipedBgColor);
height.setInterpolator(new DecelerateInterpolator(2.0f));
height.addListener(listener);
height.setDuration(sShrinkAnimationDuration);