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

Commit 1a225043 authored by Johannes Gallmann's avatar Johannes Gallmann Committed by Automerger Merge Worker
Browse files

Merge "Revert "Revert "Fix notification group dismissal fade animation""" into... 

Merge "Revert "Revert "Fix notification group dismissal fade animation""" into tm-qpr-dev am: 46fa95fc

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



Change-Id: Iddd7b2a860978e7b8190df6ba143b8d9a97a2919
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 600dfc97 46fa95fc

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

+1 −1
Original line number Diff line number Diff line
@@ -1511,7 +1511,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
@@ -494,6 +494,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

     */