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

Commit 4969d81c authored by Johannes Gallmann's avatar Johannes Gallmann Committed by Automerger Merge Worker
Browse files

Merge "Fix notification group dismissal fade animation" into tm-qpr-dev am:... 

Merge "Fix notification group dismissal fade animation" into tm-qpr-dev am: 0bad9c5a am: e59420f7

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



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

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

+1 −1
Original line number Diff line number Diff line
@@ -1487,7 +1487,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
            l.setAlpha(alpha);

        }

        if (mChildrenContainer != null) {

            mChildrenContainer.setAlpha(alpha);

            mChildrenContainer.setContentAlpha(alpha);

        }

    }

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

+14 −0
Original line number Diff line number Diff line
@@ -461,6 +461,20 @@ public class NotificationChildrenContainer extends ViewGroup 
        return mAttachedChildren;

    }



    /**

     * Sets the alpha on the content, while leaving the background of the container itself as is.

     *

     * @param alpha alpha value to apply to the content

     */

    public void setContentAlpha(float alpha) {

        for (int i = 0; i < mNotificationHeader.getChildCount(); i++) {

            mNotificationHeader.getChildAt(i).setAlpha(alpha);

        }

        for (ExpandableNotificationRow child : getAttachedChildren()) {

            child.setContentAlpha(alpha);

        }

    }



    /** To be called any time the rows have been updated */

    public void updateExpansionStates() {

        if (mChildrenExpanded || mUserLocked) {