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

Commit e90e523d authored by Lyn's avatar Lyn
Browse files

Simplify generateHeadsUpAnimation to only take entry 

Bug: 315362456
Test: manual, no HUN regressions
Change-Id: I705c3987a6cdc96e66bc6c556f73e70a6056b0a8
parent e4387bfe

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+2 −4
Original line number Diff line number Diff line
@@ -4350,8 +4350,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
        @Override

        public void onHeadsUpPinned(NotificationEntry entry) {

            if (!isKeyguardShowing()) {

                mNotificationStackScrollLayoutController.generateHeadsUpAnimation(

                        entry.getHeadsUpAnimationView(), true);

                mNotificationStackScrollLayoutController.generateHeadsUpAnimation(entry, true);

            }

        }
@@ -4363,8 +4362,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
            // notification

            // will stick to the top without any interaction.

            if (isFullyCollapsed() && entry.isRowHeadsUp() && !isKeyguardShowing()) {

                mNotificationStackScrollLayoutController.generateHeadsUpAnimation(

                        entry.getHeadsUpAnimationView(), false);

                mNotificationStackScrollLayoutController.generateHeadsUpAnimation(entry, false);

                entry.setHeadsUpIsVisible();

            }

        }

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java

+0 −4
Original line number Diff line number Diff line
@@ -4891,10 +4891,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 


    public void generateHeadsUpAnimation(NotificationEntry entry, boolean isHeadsUp) {

        ExpandableNotificationRow row = entry.getHeadsUpAnimationView();

        generateHeadsUpAnimation(row, isHeadsUp);

    }



    public void generateHeadsUpAnimation(ExpandableNotificationRow row, boolean isHeadsUp) {

        final boolean add = mAnimationsEnabled && (isHeadsUp || mHeadsUpGoingAwayAnimationsAllowed);

        if (SPEW) {

            Log.v(TAG, "generateHeadsUpAnimation:"

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java

+1 −5
Original line number Diff line number Diff line
@@ -1491,14 +1491,10 @@ public class NotificationStackScrollLayoutController implements Dumpable { 
        return mView.getFirstChildNotGone();

    }



    private void generateHeadsUpAnimation(NotificationEntry entry, boolean isHeadsUp) {

    public void generateHeadsUpAnimation(NotificationEntry entry, boolean isHeadsUp) {

        mView.generateHeadsUpAnimation(entry, isHeadsUp);

    }



    public void generateHeadsUpAnimation(ExpandableNotificationRow row, boolean isHeadsUp) {

        mView.generateHeadsUpAnimation(row, isHeadsUp);

    }



    public void setMaxTopPadding(int padding) {

        mView.setMaxTopPadding(padding);

    }