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

Commit 35286b37 authored by Johannes Gallmann's avatar Johannes Gallmann Committed by Automerger Merge Worker
Browse files

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

Merge "Revert "Fix notification group dismissal fade animation"" into tm-qpr-dev am: 80b4539c am: e6ec800c

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



Change-Id: I5c4abed3932b2706d9120ed604632e9a456431a4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1bda68a6 e6ec800c

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.setContentAlpha(alpha);

            mChildrenContainer.setAlpha(alpha);

        }

    }

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

+0 −14
Original line number Diff line number Diff line
@@ -461,20 +461,6 @@ 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) {