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 am: 5f1b2bdd50

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15013931

Change-Id: Ic21adfa5ccdae518a05e5f40d7424a50a2c72a69
This commit is contained in:
Jeff DeCew
2021-06-18 13:47:52 +00:00
committed by Automerger Merge Worker
parent 3dd279b1c5 5f1b2bdd50
commit c35d1ad6f7
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
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>

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) {
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();