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

Commit 02ab10d6 authored by András Kurucz's avatar András Kurucz Committed by Automerger Merge Worker
Browse files

Merge "Remove unused param from ExpandableView#performRemoveAnimation" into... 

Merge "Remove unused param from ExpandableView#performRemoveAnimation" into udc-qpr-dev am: bfa9c932

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23828523



Change-Id: Ia8356c1c68f27d6e0a9604ae2290f0cad307b234
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 60976161 bfa9c932

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

    }