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

Commit f3db8f65 authored by András Kurucz's avatar András Kurucz
Browse files

Remove unused param from ExpandableView#performRemoveAnimation 

The HUN disappear animation used to have transition to move the
Notification background to the place of its icon. This animation doesn't
exist anymore, and we can remove this unused param.

Bug: b/243302608
Test: post a HUN and observe the remove animation
Change-Id: Ia48a8d7593ecf00eb067bace051b5c26246dd179
parent ce5df3f1

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationView.java

+3 −3
Original line number Diff line number Diff line
@@ -359,9 +359,9 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView 
    }



    @Override

    public long performRemoveAnimation(long duration, long delay,

            float translationDirection, boolean isHeadsUpAnimation, float endLocation,

            Runnable onFinishedRunnable, AnimatorListenerAdapter animationListener) {

    public long performRemoveAnimation(long duration, long delay, float translationDirection,

            boolean isHeadsUpAnimation, Runnable onFinishedRunnable,

            AnimatorListenerAdapter animationListener) {

        enableAppearDrawing(true);

        mIsHeadsUpAnimation = isHeadsUpAnimation;

        if (mDrawingAppearAnimation) {

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java

+2 −3
Original line number Diff line number Diff line
@@ -2975,7 +2975,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
            long delay,

            float translationDirection,

            boolean isHeadsUpAnimation,

            float endLocation,

            Runnable onFinishedRunnable,

            AnimatorListenerAdapter animationListener) {

        if (mMenuRow != null && mMenuRow.isMenuVisible()) {
@@ -2986,7 +2985,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
                    public void onAnimationEnd(Animator animation) {

                        ExpandableNotificationRow.super.performRemoveAnimation(

                                duration, delay, translationDirection, isHeadsUpAnimation,

                                endLocation, onFinishedRunnable, animationListener);

                                onFinishedRunnable, animationListener);

                    }

                });

                anim.start();
@@ -2994,7 +2993,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
            }

        }

        return super.performRemoveAnimation(duration, delay, translationDirection,

                isHeadsUpAnimation, endLocation, onFinishedRunnable, animationListener);

                isHeadsUpAnimation, onFinishedRunnable, animationListener);

    }



    @Override

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableView.java

+1 −2
Original line number Diff line number Diff line
@@ -367,7 +367,6 @@ public abstract class ExpandableView extends FrameLayout implements Dumpable, Ro 
     *                             such that the  child appears to be going away to the top. 1

     *                             Should mean the opposite.

     * @param isHeadsUpAnimation Is this a headsUp animation.

     * @param endLocation The location where the horizonal heads up disappear animation should end.

     * @param onFinishedRunnable A runnable which should be run when the animation is finished.

     * @param animationListener An animation listener to add to the animation.

     *
@@ -375,7 +374,7 @@ public abstract class ExpandableView extends FrameLayout implements Dumpable, Ro 
     * animation starts.

     */

    public abstract long performRemoveAnimation(long duration,

            long delay, float translationDirection, boolean isHeadsUpAnimation, float endLocation,

            long delay, float translationDirection, boolean isHeadsUpAnimation,

            Runnable onFinishedRunnable,

            AnimatorListenerAdapter animationListener);

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/StackScrollerDecorView.java

+1 −1
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ public abstract class StackScrollerDecorView extends ExpandableView { 


    @Override

    public long performRemoveAnimation(long duration, long delay,

            float translationDirection, boolean isHeadsUpAnimation, float endLocation,

            float translationDirection, boolean isHeadsUpAnimation,

            Runnable onFinishedRunnable,

            AnimatorListenerAdapter animationListener) {

        // TODO: Use duration

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/MediaContainerView.kt

+8 −5
Original line number Diff line number Diff line
@@ -69,11 +69,14 @@ class MediaContainerView(context: Context, attrs: AttributeSet?) : ExpandableVie 
        canvas.clipPath(clipPath)

    }





    override fun performRemoveAnimation(duration: Long, delay: Long, translationDirection: Float,

                                        isHeadsUpAnimation: Boolean, endLocation: Float,

    override fun performRemoveAnimation(

            duration: Long,

            delay: Long,

            translationDirection: Float,

            isHeadsUpAnimation: Boolean,

            onFinishedRunnable: Runnable?,

                                        animationListener: AnimatorListenerAdapter?): Long {

            animationListener: AnimatorListenerAdapter?

    ): Long {

        return 0

    }