diff options
Diffstat (limited to 'packages/SystemUI')
3 files changed, 10 insertions, 4 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/SwipeHelper.java b/packages/SystemUI/src/com/android/systemui/SwipeHelper.java index cd8bd4e..14ce266 100644 --- a/packages/SystemUI/src/com/android/systemui/SwipeHelper.java +++ b/packages/SystemUI/src/com/android/systemui/SwipeHelper.java @@ -236,10 +236,6 @@ public class SwipeHelper { public void onAnimationEnd(Animator animation) { mCallback.onChildDismissed(view); animView.setLayerType(View.LAYER_TYPE_NONE, null); - // Restore the alpha/translation parameters to what they were before swiping - // (for when these items are recycled) - animView.setAlpha(1f); - setTranslation(animView, 0f); } }); anim.addUpdateListener(new AnimatorUpdateListener() { diff --git a/packages/SystemUI/src/com/android/systemui/recent/RecentsHorizontalScrollView.java b/packages/SystemUI/src/com/android/systemui/recent/RecentsHorizontalScrollView.java index 4718a17..4dc3e33 100644 --- a/packages/SystemUI/src/com/android/systemui/recent/RecentsHorizontalScrollView.java +++ b/packages/SystemUI/src/com/android/systemui/recent/RecentsHorizontalScrollView.java @@ -181,6 +181,11 @@ public class RecentsHorizontalScrollView extends HorizontalScrollView mLinearLayout.removeView(v); mCallback.handleSwipe(v); v.setActivated(false); + // Restore the alpha/translation parameters to what they were before swiping + // (for when these items are recycled) + View contentView = getChildContentView(v); + contentView.setAlpha(1f); + contentView.setTranslationY(0); } public void onBeginDrag(View v) { diff --git a/packages/SystemUI/src/com/android/systemui/recent/RecentsVerticalScrollView.java b/packages/SystemUI/src/com/android/systemui/recent/RecentsVerticalScrollView.java index 0605c4c..19fce37 100644 --- a/packages/SystemUI/src/com/android/systemui/recent/RecentsVerticalScrollView.java +++ b/packages/SystemUI/src/com/android/systemui/recent/RecentsVerticalScrollView.java @@ -187,6 +187,11 @@ public class RecentsVerticalScrollView extends ScrollView implements SwipeHelper mLinearLayout.removeView(v); mCallback.handleSwipe(v); v.setActivated(false); + // Restore the alpha/translation parameters to what they were before swiping + // (for when these items are recycled) + View contentView = getChildContentView(v); + contentView.setAlpha(1f); + contentView.setTranslationX(0); } public void onBeginDrag(View v) { |