diff options
| -rw-r--r-- | packages/SystemUI/res/values/config.xml | 2 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationChildrenContainer.java | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index b4deaa0af543..47f7751d0316 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -430,7 +430,7 @@ <!-- Whether or not the dividing lines should be shown when the container is expanding and collapsing. If this value is true, then the lines will only show when the container has been completely expanded. --> - <bool name="config_hideDividersDuringExpand">false</bool> + <bool name="config_hideDividersDuringExpand">true</bool> <!-- Whether or not child notifications that are part of a group will have shadows. --> <bool name="config_enableShadowOnChildNotifications">true</bool> 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 99fe541d0135..f2e39e78df36 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 @@ -710,10 +710,10 @@ public class NotificationChildrenContainer extends ViewGroup { if (mUserLocked) { expandFraction = getGroupExpandFraction(); } - final boolean dividersVisible = mUserLocked && !showingAsLowPriority() - || (mChildrenExpanded && mShowDividersWhenExpanded) - || (mContainingNotification.isGroupExpansionChanging() - && !mHideDividersDuringExpand); + final boolean isExpanding = !showingAsLowPriority() + && (mUserLocked || mContainingNotification.isGroupExpansionChanging()); + final boolean dividersVisible = (mChildrenExpanded && mShowDividersWhenExpanded) + || (isExpanding && !mHideDividersDuringExpand); for (int i = 0; i < childCount; i++) { ExpandableNotificationRow child = mAttachedChildren.get(i); ExpandableViewState viewState = child.getViewState(); @@ -789,10 +789,10 @@ public class NotificationChildrenContainer extends ViewGroup { int childCount = mAttachedChildren.size(); ViewState tmpState = new ViewState(); float expandFraction = getGroupExpandFraction(); - final boolean dividersVisible = mUserLocked && !showingAsLowPriority() - || (mChildrenExpanded && mShowDividersWhenExpanded) - || (mContainingNotification.isGroupExpansionChanging() - && !mHideDividersDuringExpand); + final boolean isExpanding = !showingAsLowPriority() + && (mUserLocked || mContainingNotification.isGroupExpansionChanging()); + final boolean dividersVisible = (mChildrenExpanded && mShowDividersWhenExpanded) + || (isExpanding && !mHideDividersDuringExpand); for (int i = childCount - 1; i >= 0; i--) { ExpandableNotificationRow child = mAttachedChildren.get(i); ExpandableViewState viewState = child.getViewState(); |