commit cfe6940d65597cfb2b9cfd47d881bdcee9f6f21d
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Mar 13 11:31:12 2025 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 13 11:31:12 2025 -0700
tree 0d5ca14f2fee7a7c2627bf9348c0d14d7dc3c49e
parent c2e7ada4504d2f8e963d074b0b2d12b36226e80a
parent 6447c38e57068bb53b9ea9ec20ba6f7e28db9cee

Merge "Enable group child bg fix when redesign flag is on" into main

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

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java
index 256d549..2a3b266 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java
@@ -4011,7 +4011,8 @@
             }
         } else if (isChildInGroup()) {
             final int childColor = getShowingLayout().getBackgroundColorForExpansionState();
-            if (Flags.notificationRowTransparency() && childColor == Color.TRANSPARENT) {
+            if ((Flags.notificationRowTransparency() || notificationsRedesignTemplates())
+                    && childColor == Color.TRANSPARENT) {
                 // If child is not customizing its background color, switch from the parent to
                 // the child background when the expansion finishes.
                 mShowNoBackground = !mNotificationParent.mShowNoBackground;