Merge "Account for bundles when avoiding notif overlap" into main (02ff858a) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java

+13 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1538,9 +1538,7 @@ public class NotificationStackScrollLayout
	boolean canClip = true;		boolean canClip = true;
	if (child instanceof ExpandableNotificationRow row) {		if (child instanceof ExpandableNotificationRow row) {
	if (row.isChildInGroup()) {		if (row.isChildInGroup()) {
	ExpandableNotificationRow notifParent = row.getNotificationParent();		canClip = canClipChildRow(row);
	canClip = notifParent.isGroupExpanded()
	&& !notifParent.isGroupExpansionChanging();
	}		}
	if (row.isBackgroundOpaque()) {		if (row.isBackgroundOpaque()) {
	canClip = false;		canClip = false;
	@@ -1568,6 +1566,18 @@ public class NotificationStackScrollLayout
	Collections.sort(overlappingList, mNotGoneIndexComparator);		Collections.sort(overlappingList, mNotGoneIndexComparator);
	}		}

			private boolean canClipChildRow(ExpandableNotificationRow row) {
			ExpandableNotificationRow notifParent = row.getNotificationParent();
			if (NotificationBundleUi.isEnabled()) {
			return notifParent.isGroupExpanded()
			&& !notifParent.isGroupExpansionChanging()
			&& (!notifParent.isChildInGroup() \|\| canClipChildRow(notifParent));
			} else {
			return notifParent.isGroupExpanded()
			&& !notifParent.isGroupExpansionChanging();
			}
			}

	private void updateScrollStateForAddedChildren() {		private void updateScrollStateForAddedChildren() {
	if (mChildrenToAddAnimated.isEmpty()) {		if (mChildrenToAddAnimated.isEmpty()) {
	return;		return;