| commit | 4abe5486f8ff9720fff4b580ed5704bcc1770fad | [log] [tgz] |
|---|---|---|
| author | Michael Jurka <mikejurka@google.com> | Thu Feb 23 23:58:30 2012 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Feb 23 23:58:30 2012 -0800 |
| tree | 6d677d1d1acd68909ad8af32873a0200df468752 | |
| parent | 2d77b5332ac4ef5b252fbd8f56a195e0fce03292 [diff] | |
| parent | 2db72fce6cfc0081583b9726ad80a7d95e064891 [diff] |
Merge "Fix blip after notifications are swiped"
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 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 @@ 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 @@ 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) {