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

Commit f66699ae authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fixes background animation on dismiss."

parents 5d7e531c da13cfa5

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

+6 −4
Original line number Original line Diff line number Diff line
@@ -2768,6 +2768,10 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd 
    private void updateFirstAndLastBackgroundViews() {

    private void updateFirstAndLastBackgroundViews() {

        NotificationSection firstSection = getFirstVisibleSection();

        NotificationSection firstSection = getFirstVisibleSection();

        NotificationSection lastSection = getLastVisibleSection();

        NotificationSection lastSection = getLastVisibleSection();

        ActivatableNotificationView previousFirstChild =

                firstSection == null ? null : firstSection.getFirstVisibleChild();

        ActivatableNotificationView previousLastChild =

                lastSection == null ? null : lastSection.getLastVisibleChild();





        ActivatableNotificationView firstChild = getFirstChildWithBackground();

        ActivatableNotificationView firstChild = getFirstChildWithBackground();

        ActivatableNotificationView lastChild = getLastChildWithBackground();

        ActivatableNotificationView lastChild = getLastChildWithBackground();
@@ -2775,10 +2779,8 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd 
                mSections[0], mSections[1], firstChild, lastChild);

                mSections[0], mSections[1], firstChild, lastChild);





        if (mAnimationsEnabled && mIsExpanded) {

        if (mAnimationsEnabled && mIsExpanded) {

            mAnimateNextBackgroundTop =

            mAnimateNextBackgroundTop = firstChild != previousFirstChild;

                    firstSection == null || firstChild != firstSection.getFirstVisibleChild();

            mAnimateNextBackgroundBottom = lastChild != previousLastChild;

            mAnimateNextBackgroundBottom =

                    lastSection == null || lastChild != lastSection.getLastVisibleChild();

            mAnimateNextSectionBoundsChange = sectionViewsChanged;

            mAnimateNextSectionBoundsChange = sectionViewsChanged;

        } else {

        } else {

            mAnimateNextBackgroundTop = false;

            mAnimateNextBackgroundTop = false;