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

Commit 42d5498b authored by Yining Liu's avatar Yining Liu Committed by Android (Google) Code Review
Browse files

Merge "Rename NotificationEntry.isChildInGroup()" into main

parents c5344a35 cf8fb3b5

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