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

Commit 3d333acf authored May 16, 2025 by Andreas Miko Committed by Android (Google) Code Review May 16, 2025

Merge "Fix bundle header background during expansion" into main

parents 861dbd30 92e203c1

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

+8 −1

Original line number	Diff line number	Diff line
		@@ -4090,7 +4090,14 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
		* Updates the parent and children backgrounds in a group based on the expansion state.
		*/
		public void updateBackgroundForGroupState() {
		if (mIsSummaryWithChildren) {
		if (mIsSummaryWithChildren && isBundle()) {
		// For Bundles we let the BundleHeader show its background permanently. This is
		// possible because collapsed Bundles don't preview their children unlike summaries.
		// It is important that backgrounds don't overlap during expansion since
		// notificationRowTransparency() introduced transparency.
		mShowNoBackground = true;
		mChildrenContainer.updateHeaderForExpansion(mShowNoBackground);
		} else if (mIsSummaryWithChildren) {
		// With row transparency, a pinned notification should not hide its background.
		if (notificationRowTransparency() && isPinned()) {
		mShowNoBackground = false;

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -1432,8 +1432,6 @@ public class NotificationChildrenContainer extends ViewGroup
		if (expanded) {
		ColorDrawable cd = new ColorDrawable();
		cd.setColor(mContainingNotification.calculateBgColor());
		// TODO(b/389839492): The backgroundDrawable needs an outline like in the original:
		// setOutlineProvider(mProvider);
		mBundleHeaderViewModel.setBackgroundDrawable(cd);
		} else {
		mBundleHeaderViewModel.setBackgroundDrawable(null);