Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 09ca7e73c0

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

Change-Id: I581aed7e42200d5b78a5e7ac396c76eed883450c
This commit is contained in:
Mady Mellor
2016-06-02 16:14:53 +00:00
committed by android-build-merger
parent 6b9371ceef 09ca7e73c0
commit ece7cd7120
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
View File

@@ -1166,6 +1166,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
mChildrenContainer.recreateNotificationHeader(mExpandClickListener, mChildrenContainer.recreateNotificationHeader(mExpandClickListener,
mEntry.notification); mEntry.notification);
} }
getShowingLayout().updateBackgroundColor(false /* animate */);
mPrivateLayout.updateExpandButtons(isExpandable()); mPrivateLayout.updateExpandButtons(isExpandable());
updateChildrenHeaderAppearance(); updateChildrenHeaderAppearance();
updateChildrenVisibility(); updateChildrenVisibility();

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

@@ -127,7 +127,8 @@ public class NotificationCustomViewWrapper extends NotificationViewWrapper {
@Override @Override
public int getCustomBackgroundColor() { public int getCustomBackgroundColor() {
return mBackgroundColor; // Parent notifications should always use the normal background color
return mRow.isSummaryWithChildren() ? 0 : mBackgroundColor;
} }
@Override @Override