Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4abe5486 authored by Michael Jurka's avatar Michael Jurka Committed by Android (Google) Code Review
Browse files

Merge "Fix blip after notifications are swiped"

parents 2d77b533 2db72fce

packages/SystemUI/src/com/android/systemui/SwipeHelper.java

+0 −4
Original line number Diff line number Diff line
@@ -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() {

packages/SystemUI/src/com/android/systemui/recent/RecentsHorizontalScrollView.java

+5 −0
Original line number Diff line number Diff line
@@ -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) {

packages/SystemUI/src/com/android/systemui/recent/RecentsVerticalScrollView.java

+5 −0
Original line number Diff line number Diff line
@@ -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) {