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

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

@@ -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

@@ -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