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

Commit 0e6207ef authored by Mady Mellor's avatar Mady Mellor Committed by android-build-merger
Browse files

Merge "Parent notifications should always be normal notification color" into nyc-dev 

am: 09ca7e73

* commit '09ca7e73':
  Parent notifications should always be normal notification color

Change-Id: I81160e649188e21d4c763abd8d222fa83608322d
parents 462db089 09ca7e73

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

+1 −0
Original line number Diff line number Diff line
@@ -1166,6 +1166,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView { 
            mChildrenContainer.recreateNotificationHeader(mExpandClickListener,

                    mEntry.notification);

        }

        getShowingLayout().updateBackgroundColor(false /* animate */);

        mPrivateLayout.updateExpandButtons(isExpandable());

        updateChildrenHeaderAppearance();

        updateChildrenVisibility();

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationCustomViewWrapper.java

+2 −1
Original line number Diff line number Diff line
@@ -127,7 +127,8 @@ public class NotificationCustomViewWrapper extends NotificationViewWrapper { 


    @Override

    public int getCustomBackgroundColor() {

        return mBackgroundColor;

        // Parent notifications should always use the normal background color

        return mRow.isSummaryWithChildren() ? 0 : mBackgroundColor;

    }



    @Override