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

Merge "Remove dividers when expanding groups." into sc-dev

Browse Source
This commit is contained in:
Jeff DeCew
2021-06-18 13:31:12 +00:00
committed by Android (Google) Code Review
parent fc3491bd3e a2f705e191
commit 5f1b2bdd50
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res/values/config.xml
View File

@@ -426,7 +426,7 @@
<!-- Whether or not the dividing lines should be shown when the container is expanding and <!-- 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 collapsing. If this value is true, then the lines will only show when the container has
been completely expanded. --> 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. --> <!-- Whether or not child notifications that are part of a group will have shadows. -->
<bool name="config_enableShadowOnChildNotifications">true</bool> <bool name="config_enableShadowOnChildNotifications">true</bool>

16
packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationChildrenContainer.java
View File

@@ -710,10 +710,10 @@ public class NotificationChildrenContainer extends ViewGroup {
if (mUserLocked) { if (mUserLocked) {
expandFraction = getGroupExpandFraction(); expandFraction = getGroupExpandFraction();
} }
final boolean dividersVisible = mUserLocked && !showingAsLowPriority() final boolean isExpanding = !showingAsLowPriority()
|| (mChildrenExpanded && mShowDividersWhenExpanded) && (mUserLocked || mContainingNotification.isGroupExpansionChanging());
|| (mContainingNotification.isGroupExpansionChanging() final boolean dividersVisible = (mChildrenExpanded && mShowDividersWhenExpanded)
&& !mHideDividersDuringExpand); || (isExpanding && !mHideDividersDuringExpand);
for (int i = 0; i < childCount; i++) { for (int i = 0; i < childCount; i++) {
ExpandableNotificationRow child = mAttachedChildren.get(i); ExpandableNotificationRow child = mAttachedChildren.get(i);
ExpandableViewState viewState = child.getViewState(); ExpandableViewState viewState = child.getViewState();
@@ -789,10 +789,10 @@ public class NotificationChildrenContainer extends ViewGroup {
int childCount = mAttachedChildren.size(); int childCount = mAttachedChildren.size();
ViewState tmpState = new ViewState(); ViewState tmpState = new ViewState();
float expandFraction = getGroupExpandFraction(); float expandFraction = getGroupExpandFraction();
final boolean dividersVisible = mUserLocked && !showingAsLowPriority() final boolean isExpanding = !showingAsLowPriority()
|| (mChildrenExpanded && mShowDividersWhenExpanded) && (mUserLocked || mContainingNotification.isGroupExpansionChanging());
|| (mContainingNotification.isGroupExpansionChanging() final boolean dividersVisible = (mChildrenExpanded && mShowDividersWhenExpanded)
&& !mHideDividersDuringExpand); || (isExpanding && !mHideDividersDuringExpand);
for (int i = childCount - 1; i >= 0; i--) { for (int i = childCount - 1; i >= 0; i--) {
ExpandableNotificationRow child = mAttachedChildren.get(i); ExpandableNotificationRow child = mAttachedChildren.get(i);
ExpandableViewState viewState = child.getViewState(); ExpandableViewState viewState = child.getViewState();