commit a6c6bfb61ba14b0467b73082d591c834576cddf4
author Selim Cinek <cinek@google.com> Thu Oct 29 16:27:08 2015 -0700
committer Selim Cinek <cinek@google.com> Fri Oct 30 16:28:40 2015 -0700
tree e4f241ff4a97d6760fe05e8c5f480789c99a0a3f
parent 388df6dd3d07376ecd7446cae36e1486cd313171

Follow up CL for notification children change

The CLs of the notification children change have been
quite overlapping, so a few comments are addressed in this
change.

Bug: 24866646
Change-Id: If3cd029f5a97302fc33f3e2b6b6b147938ddcd3e

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

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
index 5f14bbf..3603900 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
@@ -16,6 +16,7 @@
 
 package com.android.systemui.statusbar;
 
+import android.app.Notification;
 import android.content.Context;
 import android.graphics.drawable.AnimatedVectorDrawable;
 import android.graphics.drawable.AnimationDrawable;
@@ -103,7 +104,6 @@
     private boolean mJustClicked;
     private NotificationData.Entry mEntry;
     private boolean mShowNoBackground;
-    private boolean mChildInGroup;
     private ExpandableNotificationRow mNotificationParent;
 
     public NotificationContentView getPrivateLayout() {
@@ -218,7 +218,7 @@
     }
 
     public boolean isChildInGroup() {
-        return mChildInGroup;
+        return mNotificationParent != null;
     }
 
     public ExpandableNotificationRow getNotificationParent() {
@@ -229,12 +229,11 @@
      * @param isChildInGroup Is this notification now in a group
      * @param parent the new parent notification
      */
-    public void setIsChildInGroup(boolean isChildInGroup, ExpandableNotificationRow parent) {
-        mChildInGroup = BaseStatusBar.ENABLE_CHILD_NOTIFICATIONS && isChildInGroup;
-        mNotificationParent = isChildInGroup ? parent : null;
-        mShowNoBackground = mChildInGroup && hasSameBgColor(parent);
-        mPrivateLayout.setIsChildInGroup(mShowNoBackground);
-        updateBackground();
+    public void setIsChildInGroup(boolean isChildInGroup, ExpandableNotificationRow parent) {;
+        boolean childInGroup = BaseStatusBar.ENABLE_CHILD_NOTIFICATIONS && isChildInGroup;
+        mNotificationParent = childInGroup ? parent : null;
+        mPrivateLayout.setIsChildInGroup(childInGroup);
+        updateNoBackgroundState();
     }
 
     @Override
@@ -663,7 +662,7 @@
             } else {
                 return Math.max(mRowMinHeight, mHeadsUpHeight);
             }
-        } else if (!inExpansionState || (mChildInGroup && !isGroupExpanded())) {
+        } else if (!inExpansionState || (isChildInGroup() && !isGroupExpanded())) {
             return getMinHeight();
         } else {
             return getMaxExpandHeight();
@@ -929,6 +928,25 @@
         mPublicLayout.setShowingLegacyBackground(showing);
     }
 
+    @Override
+    protected void updateBackgroundTint() {
+        super.updateBackgroundTint();
+        updateNoBackgroundState();
+        if (mIsSummaryWithChildren) {
+            List<ExpandableNotificationRow> notificationChildren =
+                    mChildrenContainer.getNotificationChildren();
+            for (int i = 0; i < notificationChildren.size(); i++) {
+                ExpandableNotificationRow child = notificationChildren.get(i);
+                child.updateNoBackgroundState();
+            }
+        }
+    }
+
+    private void updateNoBackgroundState() {
+        mShowNoBackground = isChildInGroup() && hasSameBgColor(mNotificationParent);
+        updateBackground();
+    }
+
     public void setExpansionLogger(ExpansionLogger logger, String key) {
         mLogger = logger;
         mLoggingKey = key;