Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf8fb3b5 authored Oct 14, 2023 by Yining Liu

Rename NotificationEntry.isChildInGroup()

The old NotificationEntry.isChildInGroup() currently represents whether
the corresponding notification row is a child in a group, not the
NotificationEntry. The grouping status of a NotificationEntry is not
always equal to its row's, depending on the stage of the Notification
Pipeline. We want the name NotificationEntry.isChildInGroup() to
represent the NotificationEntry's grouping status for the usage of async
inflation and other pipeline jobs.

Bug: 217799515
Test: presubmit
Change-Id: Iac2186d58671c9b53c2996f7b313fc4634e8a0ad

parent bb756a05

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -748,7 +748,11 @@ public final class NotificationEntry extends ListEntry {
		return row != null && row.getGuts() != null && row.getGuts().isExposed();
		}

		public boolean isChildInGroup() {
		/**
		* @return Whether the notification row is a child of a group notification view; false if the
		* row is null
		*/
		public boolean rowIsChildInGroup() {
		return row != null && row.isChildInGroup();
		}

packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpManagerPhone.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -175,7 +175,7 @@ public class HeadsUpManagerPhone extends BaseHeadsUpManager implements OnHeadsUp
		if (!hasPinnedHeadsUp() \|\| topEntry == null) {
		return null;
		} else {
		if (topEntry.isChildInGroup()) {
		if (topEntry.rowIsChildInGroup()) {
		final NotificationEntry groupSummary =
		mGroupMembershipManager.getGroupSummary(topEntry);
		if (groupSummary != null) {