| commit | cf8fb3b5b59048792b1e1e9ebf65e55ce406df12 | [log] [tgz] |
|---|---|---|
| author | Yining Liu <liuyining@google.com> | Sat Oct 14 22:48:52 2023 +0000 |
| committer | Yining Liu <liuyining@google.com> | Sat Oct 14 22:51:49 2023 +0000 |
| tree | 8a50dddc5ea023db4c2fdec06c9cedc9014f6f6a | |
| parent | bb756a05d86802c25d2351ed0a316019109445e1 [diff] |
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
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java index affd2d1..54bb2140 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java
@@ -748,7 +748,11 @@ 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(); }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpManagerPhone.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpManagerPhone.java index 6b4382f73..f4862c7 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpManagerPhone.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpManagerPhone.java
@@ -175,7 +175,7 @@ if (!hasPinnedHeadsUp() || topEntry == null) { return null; } else { - if (topEntry.isChildInGroup()) { + if (topEntry.rowIsChildInGroup()) { final NotificationEntry groupSummary = mGroupMembershipManager.getGroupSummary(topEntry); if (groupSummary != null) {