diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationChildrenContainer.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationChildrenContainer.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationChildrenContainer.java index ea397b61fe84..b548b5835e1e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationChildrenContainer.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationChildrenContainer.java @@ -970,7 +970,9 @@ public class NotificationChildrenContainer extends ViewGroup if (mHeaderViewState != null) { mHeaderViewState.applyToView(mGroupHeader); } - if (notificationsRedesignTemplates()) { + // Only apply the special viewState for the header's children if we're not currently showing + // the minimized header. + if (notificationsRedesignTemplates() && !showingAsLowPriority()) { if (mTopLineViewState != null) { mTopLineViewState.applyToView(mGroupHeader.getTopLineView()); } @@ -1236,14 +1238,12 @@ public class NotificationChildrenContainer extends ViewGroup } } - private ViewGroup calculateDesiredHeader() { - ViewGroup desiredHeader; + private NotificationHeaderView calculateDesiredHeader() { if (showingAsLowPriority()) { - desiredHeader = mMinimizedGroupHeader; + return mMinimizedGroupHeader; } else { - desiredHeader = mGroupHeader; + return mGroupHeader; } - return desiredHeader; } private void startChildAlphaAnimations(boolean toVisible) { |