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

Commit 2591101d authored by Rahul Banerjee's avatar Rahul Banerjee
Browse files

Fix HUN BG Mismatch on Expansion. 

Bug: 417264365
Test: Manual (build, flash, and test)
Flag: com.android.systemui.notification_row_transparency
Change-Id: I1fd795d689b04c6810773879fa8854c3fac546cf
parent 84fffed1

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java

+9 −7
Original line number Diff line number Diff line
@@ -1106,6 +1106,9 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
    public void markHeadsUpSeen() {

        super.markHeadsUpSeen();

        mMustStayOnScreen = false;

        if (notificationRowTransparency()) {

            updateBackgroundTint();

        }

    }



    /**
@@ -4135,6 +4138,9 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
                    mChildrenContainer.getAttachedChildren();

            for (int i = 0; i < notificationChildren.size(); i++) {

                ExpandableNotificationRow child = notificationChildren.get(i);

                if (notificationRowTransparency()) {

                    child.updateBackgroundTint();

                }

                child.updateBackgroundForGroupState();

            }

        }
@@ -4160,13 +4166,8 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
            mShowNoBackground = true;

            mChildrenContainer.updateHeaderForExpansion(mShowNoBackground);

        } else if (mIsSummaryWithChildren) {

            // With row transparency, a pinned notification should not hide its background.

            if (notificationRowTransparency() && isPinned()) {

                mShowNoBackground = false;

            } else {

            mShowNoBackground = !mShowGroupBackgroundWhenExpanded && isGroupExpanded()

                    && !isGroupExpansionChanging() && !isUserLocked();

            }

            mChildrenContainer.updateHeaderForExpansion(mShowNoBackground);

            List<ExpandableNotificationRow> children = mChildrenContainer.getAttachedChildren();

            for (int i = 0; i < children.size(); i++) {
@@ -4880,6 +4881,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
        // Also, for an unpinned HUN on the unlocked shade, the row bg should be transparent.

        return super.usesTransparentBackground()

                && !mustStayOnScreen()

                && !(isChildInGroup() && !mNotificationParent.usesTransparentBackground())

                && !mHeadsupDisappearRunning

                && !mOnKeyguard;

    }