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

Commit f2473f4f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix summary cancel logic for experimental bubbles"

parents c26dc202 84094224
Loading
Loading
Loading
Loading
+9 −2
Original line number Diff line number Diff line
@@ -746,9 +746,16 @@ public class BubbleController implements ConfigurationController.ConfigurationLi
            return !isAutogroupSummary;
        } else {
            // If it's not a user dismiss it's a cancel.
            for (int i = 0; i < bubbleChildren.size(); i++) {
                // First check if any of these are user-created (i.e. experimental bubbles)
                if (mUserCreatedBubbles.contains(bubbleChildren.get(i).getKey())) {
                    // Experimental bubble! Intercept the removal.
                    return true;
                }
            }
            // Not an experimental bubble, safe to remove.
            mBubbleData.removeSuppressedSummary(groupKey);

            // Remove any associated bubble children.
            // Remove any associated bubble children with the summary.
            for (int i = 0; i < bubbleChildren.size(); i++) {
                Bubble bubbleChild = bubbleChildren.get(i);
                mBubbleData.notificationEntryRemoved(bubbleChild.getEntry(),